after comments of Tobias
Merge branch 'master' of https://github.com/enwida/idpRepo
Merge branch 'master' of https://github.com/enwida/idpRepo
Merge branch 'master' of https://github.com/enwida/idpRepo
Merge branch 'master' of https://github.com/enwida/idpRepo
merge problems are fixed
custom log per user is added
user log is added
Code improvement
banner is added
Merge branch 'master' of https://github.com/enwida/idpRepo

Conflicts:
	workspace/enwida/src/main/java/de/enwida/web/dao/implementation/UserDao.java
	workspace/enwida/src/main/java/de/enwida/web/dao/interfaces/IUserDao.java
	workspace/enwida/src/main/java/de/enwida/web/service/implementation/UserServiceImpl.java
	workspace/enwida/src/main/java/de/enwida/web/service/interfaces/UserService.java
	workspace/enwida/src/main/resources/log4j.properties