Refactoring UserController into UserApiController
Merge branch 'master' of
https://github.com/jclarke-nevo/federated-identity

Conflicts:
	src/main/java/com/nevo/controller/UserController.java
	src/test/java/com/nevo/controller/UserControllerTest.java
Switched API controller to using @RestController annotation, and
reverset order of /api/users