changed classpath
marked confilicts as resolved
Merge branch 'master' of github.com:jclarke-nevo/federated-identity
Changed UserController.java
Merge branch 'master' of
git@github.com:jclarke-nevo/federated-identity.git

Conflicts:
	src/main/java/com/nevo/controller/UserController.java
Removed exported=true from .classpath
Added comment to UserCOntroller.getUser(String) method
Fixed comment
removed duplicate unit test files
Merge branch 'master' of github.com:jclarke-nevo/federated-identity
framed out new unit test for findAllUsers
Added failing test
Merge branch 'master' of
git@github.com:jclarke-nevo/federated-identity.git

Conflicts:
	src/test/java/com/nevo/controller/UserControllerTest.java
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
updated java build path to 1.7
Merge branch 'master' of github.com:jclarke-nevo/federated-identity
Fix warnings
Updated Eclipse project classpath and preferences files