cleanup
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/webapp/resources/js/app.js