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

Conflicts:
	applications/server/src/main/java/com/clickd/server/services/users/UserResource.java
	applications/server/src/main/resources/web/imported/frameworks/angular/clickd.js
Merge branch 'master' of https://github.com/zerothreaded/clickd
CI test 1