Make px_mkfw.py and px_upload.py compatible with both python 2.7 and 3.3
Merge branch 'master' into python3_compat
Uploader works now with Python 2.7 and 3.3
The python uploader can now reboot the board
Merge branch 'master' of github.com:PX4/Firmware into python3_compat
Merge pull request #366 from julianoes/python3_compat

Make px_mkfw.py and px_upload.py compatible with both python 2.7 and 3.3
Hotfix: Minor param adjustments based on flight testing
position_estimator_inav: land detector bug fixed
Merge pull request #379 from PX4/landed_bugfix

position_estimator_inav: land detector bug fixed
Hotfix: Better error reporting, fixed sched param setup
Fixed sched param setup in MAVLink app
Merge branch 'master' of github.com:PX4/Firmware
Workaround to prevent crash during mag calibration
Merge pull request #380 from julianoes/hotfix_mag_calib

Workaround to prevent crash during mag calibration
Setting correct battery scaling for FMU-only setups
Hotfix: Gain optimization
Have systems loiter at the last waypoint
Have systems loiter at the last waypoint
Make bool on FMUv1 and FMUv2 behave the same
grab the git hash and inject it into every log file header