hikari hibernate
Merge branch 'Development'

Conflicts:
	app/com/shopservice/HibernateUtil.java
hikari hibernate