Jpa hibernate
Merge origin/master

Conflicts:
	src/main/java/kz/app/InvoiceService.java