Global project refactoring
Merge branch 'origin/master'

Conflicts:
	db/db.changelog-master.xml
	pom.xml
	src/config/checkstyle.xml