Re-organization of client files
Make ui work from jar
Merge branch 'master' of github.com:trentio/urbanambassadors

Conflicts:
	src/main/resources/client/js/vendor/jquery.placeholder.js
	src/main/resources/client/js/vendor/utils.js