Merge branch 'master' into 3rd-branch

Conflicts:
	WebContent/Inloggad.jsp
	WebContent/LoggedIn.jsp
	WebContent/WEB-INF/web.xml
	WebContent/controller.jsp
	WebContent/login.jsp
	WebContent/newUser.jsp
	WebContent/startPage.jsp