Updated user dao
checking for user test
Merge branch 'origin/master'

Conflicts:
	workspace/enwida/src/main/java/de/enwida/web/dao/implementation/UserDaoImpl.java
	workspace/enwida/src/test/java/de/enwida/web/UserManagement.java