merge master to john

merge master to john
pause & resume started working

pause & resume started working
stop/resume hooked up

haven't tested out with a robot yet
fixed stop overlay size

fixed stop overlay size
Merge branch 'John'

Conflicts:
	js/main.js

Conflicts should be resolved now
resolved conflict

copied code from cole's branch for text editor stuff
removed cursor editor stuff from update loop

two functions now called by jQuery in main.js
Merge branch 'John'

Conflicts:
	js/main.js

Resolved conflicts (hopefully)
Merge branch 'master' into Cole