[NGRINDER-678] Allow user registration
Merge remote-tracking branch 'origin/master'

Conflicts:
	ngrinder-controller/src/main/java/org/ngrinder/user/controller/UserController.java
[NGRINDER-678] Allow user registration