1
Merge branch 'master' of https://github.com/AlNovik/bookStore

Conflicts:
	core/bookStore/bs-dao/src/main/java/pro/redsoft/dao/ContactDAO.java
	core/bookStore/bs-dao/src/main/java/pro/redsoft/dao/ContactDAOImpl.java
	core/bookStore/bs-dao/target/classes/hibernate.cfg.xml
	database/_book_store_ddl.sql
	database/_book_store_ddlrollback.sql
	database/book_store_ddl.sql