synchronization was fixed, conn pool was changed
Merge branch 'Development'

Conflicts:
	app/com/shopservice/HibernateUtil.java
	conf/application.conf
hikari conn pool