Merge pull request #743 from PX4/rcS_hotfix

add missing $ in rcS script
Merge remote-tracking branch 'upstream/master' into test_20140315
Merge branch 'test_20140315' into test_20140315_paul