commit
Merge branch 'master' of https://github.com/m4ff/simple-forum

Conflicts:
	src/java/db/DBManager.java