setting jpa
Merge branch 'master' of https://github.com/MaximDolina/GreenTea

Conflicts:
	pom.xml
	src/main/webapp/WEB-INF/web.xml