Merge branch 'Development'

Conflicts:
	app/com/shopservice/HibernateUtil.java
revert last commit
revert last commit
merge conflict in HibernateUtil