add angular
Merge branch 'master' of https://github.com/zerothreaded/clickd

Conflicts:
	applications/server/src/main/resources/assets/common/js/application.js