1st commit
Merge branch 'master' of https://github.com/hukla/gaenari/
commit
Conflicts:
	WebContent/WEB-INF/actionMapping.properties