test refactor v2
Merge remote-tracking branch 'origin/master'

Conflicts:
	Model/src/main/resources/META-INF/persistence.xml
	Model/src/main/resources/applicationContext.xml
test refactor v2