My J
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/build/js/app.js
	app/views/PageView.js
Templates