Only smaller changes. But config error still present.
Signed-off-by: Stefano Leccese <stefano-leccese@visiongamestudios.de>
Merge branch 'master' into DBMigration

Conflicts:
	app/models/db2/Users.java
Merge branch 'DBMigration'