changes
Merge remote-tracking branch 'origin/master'

Conflicts:
	KnigaLocalProject.iml
	src/main/resources/db/migration/V005__Create_Shop.sql
	src/main/resources/db/migration/V007__Create_Disk.sql
changes dao