JPA+EntityManager+JUnitTests
Merge branch 'akorobitsyn'
JPA EM, Ju tests for Categ, City ready
Tests for Categ, City added
fix merge conflect
Merge branch 'salidinov2'