Config comments
Merge branch 'master' of https://github.com/NikolaiSamteladze/George

Conflicts:
	ShopWebsite/.idea/workspace.xml
	ShopWebsite/target/ShopWebsite.war
	ShopWebsite/target/ShopWebsite/WEB-INF/jsp/clients.jsp
	ShopWebsite/target/ShopWebsite/WEB-INF/jsp/dbSales.jsp
	ShopWebsite/target/ShopWebsite/index.jsp