Merge branch 'master' of https://github.com/miromarko/TestJPA2.git