Merge branch 'master' of github.com:mavlink/qgroundcontrol into config
Merge branch 'config' of github.com:mavlink/qgroundcontrol into config
Merge branch 'master' of github.com:mavlink/qgroundcontrol into config
Fixed Windows compile errors
Merge branch 'config' of github.com:mavlink/qgroundcontrol into config
don't even attempt to send message if link is down
Remove OK button on RC cal steps where it doesn't make sense

Cleanup some RC calibration text as well
small RC calibration text tweaks
Merge pull request #362 from tstellanova/qgc_beta01

Avoid transmit problems by not attempting to send on disconnected links
reset lastReceiveTime
clear channel mappings for > Ch 5 when starting rc cal
Merge pull request #363 from tstellanova/qgc_beta01

Clear channel mappings at rc cal start; reset lastReceiveTime as needed
Merge branch 'config' of github.com:mavlink/qgroundcontrol into config
Fixed RC cal
Loading the correct mag icons for a few rotations now
Merge branch 'config' of github.com:mavlink/qgroundcontrol into config
Custom plist file to set version number for Mac OSX
add win32 target version info
Use QGroundControl team instead of PX4
Merge pull request #365 from tstellanova/update_version_info

Update version info