Update user login
Merge branch 'master' of https://github.com/YassirDriuch/Accent

Conflicts:
	war/WEB-INF/appengine-web.xml
	war/panel.jsp