Persistence commit
Merge branch 'master' of https://github.com/Jamnic/real-kingdom

Conflicts:
	Engine Component Parent/pom.xml
	Persistence Component/pom.xml