Added collision mode
Merge branch 'develop' of github.com:2729StormRobotics/Storm2014 into develop