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

Conflicts:
	src/main/java/tc/lv/web/LocationController.java
	src/main/resources/META-INF/persistence.xml