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
Cookie security service for encryting and decrypting (loggedIn/Anonymous) user settings data in a cookie
User settings in a cookie
Use from date picker and range selection instead of two date pickers
Fix double requesting lines
Improve bar chart implementation
Merge branch 'master' of github.com:enwida/idpRepo
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
Merge branch 'daterange'

Conflicts:
	workspace/enwida/src/main/webapp/resources/js/chart/charts.js
	workspace/enwida/src/main/webapp/resources/js/chart/lib/navigation.coffee
Merge branch 'master' of github.com:enwida/idpRepo