User login added
Merge branch 'Testing' of https://github.com/scorelab/OpenDF into Testing

Conflicts:
	OpenDF-web/src/main/webapp/js/dashboard.js