Small fixes
Config changes
Config changes
Merge origin/master

Conflicts:
	src/main/resources/META-INF/persistence.xml