implemented requirejs, deactivates injector.
Merge remote-tracking branch 'origin/master' into require

Conflicts:
	client/app/Screen.js
	client/app/app.js
Merge remote-tracking branch 'origin/master' into require

Conflicts:
	client/app/Screen.js
	client/app/app.js