pre-merge commit
Merge branch 'master' of https://github.com/zaans2/THO4.git

Conflicts:
	war/Menu.jsp
	war/css/style.css