Merge branch 'inlineEditable'
Fixed merge conflicts
Merge remote-tracking branch 'upstream/master'

Conflicts:
	scripts/codeEditor.js
Merge branch 'master' of github.com:AlexNisnevich/untrusted
Moved VERBOTEN keywords out of global scope into the game object