commit
Merge branch 'master' of https://github.com/hukla/gaenari

Conflicts:
	WebContent/scripts/home.js
	WebContent/scripts/login.js
	WebContent/static/pages/head.jsp
	WebContent/static/pages/header.jsp
	WebContent/static/pages/menubar.jsp
	src/controller/action/LogoutAction.java