created update test for userdao
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/java/org/osiam/ng/scim/mvc/user/UserController.java