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

Conflicts:
	core/bookStore/bs-web/src/main/webapp/WEB-INF/jdbc.properties
Merge remote-tracking branch 'origin/master'

Conflicts:
	core/bookStore/bs-dao/src/main/java/pro/redsoft/bean/Basket.java
	core/bookStore/bs-service/src/main/java/pro/redsoft/service/IService.java
	core/bookStore/bs-service/src/main/java/pro/redsoft/service/IServiceImpl.java
	core/bookStore/bs-web/src/main/java/pro/redsoft/controller/MainController.java
	core/bookStore/bs-web/src/main/webapp/WEB-INF/jdbc.properties
	core/bookStore/bs-web/src/main/webapp/WEB-INF/templates.xml
Merge branch 'master' of https://github.com/AlNovik/bookStore

Conflicts:
	core/bookStore/bs-web/src/main/webapp/WEB-INF/jdbc.properties