Merge pull request #621 from dronekit/rroche/bump-2.5.0

bump 2.5.0

Author: mrpollo

CHANGELOG.md

@@ -1,5 +1,23 @@
 # Changelog
 
+## Version 2.5.0 (2016-05-04)
+
+### Improvements
+* Catch and display message and attribute errors, then continue
+* Improved takeoff example docs
+* Deploy docs on successful merge into master (from CircleCI)
+* Drone delivery example, explain port to connect
+* MicroCGS example now uses SITL
+* Make running examples possible on Vagrant
+
+### Bug Fixes
+* Mav type for rover was incorrect
+* `_is_mode_available` can now handle unrecognized mode codes
+* Fix broken links on companion computer page
+* Fix infinite loop on channel test
+
+
+
 ## Version 2.4.0 (2016-02-29)
 
 ### Bug Fixes

docs/about/github_latest_release.txt

@@ -3,6 +3,27 @@
 Changelog
 =========
 
+Version 2.5.0 (2016-05-04)
+--------------------------
+
+Improvements
+~~~~~~~~~~~~
+
+-  Catch and display message and attribute errors, then continue
+-  Improved takeoff example docs
+-  Deploy docs on successful merge into master (from CircleCI)
+-  Drone delivery example, explain port to connect
+-  MicroCGS example now uses SITL
+-  Make running examples possible on Vagrant
+
+Bug Fixes
+~~~~~~~~~
+
+-  Mav type for rover was incorrect
+-  ``_is_mode_available`` can now handle unrecognized mode codes
+-  Fix broken links on companion computer page
+-  Fix infinite loop on channel test
+
 Version 2.4.0 (2016-02-29)
 --------------------------
 

setup.py

@@ -1,7 +1,7 @@
 from setuptools import setup, Extension
 import platform
 
-version = '2.4.0'
+version = '2.5.0'
 
 setup(name='dronekit',
       zip_safe=True,