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