Debug git
some other debug
Merge branch 'master' of https://github.com/m4ff/simple-forum

Conflicts:
	web/WEB-INF/web.xml