Merge branch 'njm_requirejs' into fela_js

Conflicts:
	js/intersection.js
modifications to intersection.js (events)
global stuff
Added new global module for game configuration
global vars
minor syntax fixes
Merge branch 'master' into fela_js

Conflicts:
	js/_main.js
	js/intersection.js
	js/modules/intersection.js
Merge pull request #7 from felamaslen/fela_js

event modifications to intersection.js