Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop'
Minor fixes

Minors changes to drawDemo.html scripts used and fixed CircleBar
globals.
Merge branch 'develop'
Merge branch 'develop'
PS3 Controller Support

Gamepad Manager now recognizes PS3 controllers and adds and binds the
keys to the same default setting as a 360 controller.
Added in ps3.json to keep track of PS3 buttons and axes.
Started working on Scene enhancements.
Added controller changes to both consolidated files.  Will add Scene
changes when they’re done.
Merge branch 'master' into develop