Hotfix: Changed alarms back to what they originally were designed for: Traps to later see if condition was once violated. Currente status can be read through the status flags
Added CCPM mixer
changed control index for speed controller output from 5 to 4
enable usb console
change default rc channel mapping
Revert "change default rc channel mapping"

This reverts commit fa403956ed6ef1a345ee06c25500c937a78dd7cd.
Revert "enable usb console" - shouldn't be in pull request branch.

This reverts commit fdb897c3dd5561a1d9f22b35ec049e50d526d08b.
Merge pull request #275 from duncang/ccpm

Prototype CCPM mixer for helicopter
Hotfix: Removing GPS debug output
logconv.py added: convert sdlog binary log to CSV
Merge pull request #281 from DrTon/logconv_py

logconv.py added: convert sdlog binary log to CSV
Merge branch 'master' of github.com:PX4/Firmware
Hotfix: dependency scanning for modules was totally broken. Fix it so that changes to depended headers correctly cause modules to be rebuilt.
Added limit to heading command
Merge branch 'master' of github.com:PX4/Firmware
Based on comments in:

    http://answers.px4.ethz.ch/question/1337/px4io-receiver-connection-problem/?answer=1346#post-id-1346

increase the longest PPM pulse we recognize out to 550µs.
Fixed compilation of libtomcrypt
Merge branch 'master' into auth