application.js
Merge branch 'master' of https://github.com/hubuntub/zenit

Conflicts:
	src/main/webapp/index.html