Merge origin/master

Conflicts:
	src/main/resources/META-INF/persistence.xml
	src/main/setup/glassfish-resources.xml
Merge origin/master
Merge origin/master

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