login with user from db (admin/admin)
TEST
Merge branch 'master' of https://github.com/DaHu4wA/noPlan

Conflicts:
	noPlan-parent/noPlan-webapp/src/main/webapp/application/scripts/app.js