sa
Merge branch 'dev' of github.com:Andronavt/lv-098_JAVA into dev

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