Separated client side application, modified require.js
Merge remote-tracking branch 'upstream/master'

Conflicts:
	public/js/app.js