Töötav log in replacement -> settings
Merge branch 'master' of heroku.com:koodikorv

Conflicts:
	src/main/webapp/WEB-INF/login.jsp
	src/main/webapp/scriptid.js
Stupid error.
Logging out.