[new login] started work on new login page
Merge branch 'master' into custom-login

Conflicts:
	web-vaadin/src/main/webapp/WEB-INF/security.xml
updated libraries, added jsp login, reorganized servlet structure, removed spring plugin for vaadin
custom login page
fixed login page encoding
minor fixes