finpuss
Merge origin/master

Conflicts:
	src/main/webapp/Resources/mysql/dbsetup.sql