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

Conflicts:
	core/bookStore/bs-web/src/main/webapp/WEB-INF/jdbc.properties
Merge branch 'master' of https://github.com/AlNovik/bookStore