Merge remote-tracking branch 'upstream/master' into hamster
Added camera code that is unstable at the moment
Fixed Car Ramp Physics v2 complile paths and changes to images
Merge remote-tracking branch 'upstream/master' into jp646
Merge pull request #686 from jaypoulz/jp646

Jp646 -- small camera uploading changes and fixed compile paths in CRPv2