Merge branch 'John'
Merge branch 'master' into Cole
Merge branch 'master' into Cole
Update phaser to 2.014

Update: 1.1.6 —> 2.0.4
Merge branch 'Cole'
Draggable for A-D motor bars

Not implemented into motor gangs yet
on load bug fix - barA compatible w/ +/- buttons
Merge branch 'John'

Conflicts:
	js/main.js
solve conflict

kept inputEnabled
resolved conflicts

resolved conflicts
conflict

conflict
resolved

resolved
Merge branch 'master' into John