Added failing test
Merge branch 'master' of
git@github.com:jclarke-nevo/federated-identity.git

Conflicts:
	src/test/java/com/nevo/controller/UserControllerTest.java