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
Temporary global var
Merge pull request #10 from felamaslen/ssm_unitystuff

Plopping unitts
Merge pull request #9 from felamaslen/wpf-state

Temporary global var
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
Template module
Merge pull request #11 from felamaslen/wpf-template

Template module
Added units.js to _main, and modules. They contain proper unit definitions,unit test,  and unit adding methid
Merge branch 'master' of https://github.com/felamaslen/flappyworks
Merge branch 'master' into ssm_unitystuff

Conflicts:
	js/_main.js
	js/modules/units.js