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

Conflicts:
	applications/server/src/main/java/com/clickd/server/services/users/UserResource.java
Merge branch 'master' of https://github.com/zerothreaded/clickd