Merge branch 'Cole'
Draggable for A-D motor bars

Not implemented into motor gangs yet
on load bug fix - barA compatible w/ +/- buttons
layout changes

layout changes
Merge branch 'John'

Conflicts:
	js/main.js
solve conflict

kept inputEnabled
Merge branch 'master' into Cole