Pavlo + Reka changes
Merge remote-tracking branch 'origin/reka' into chemodurov

Conflicts:
	BuyIt/WebApp/jsp/productPage.jsp
	BuyIt/src/main/java/com/epam/lab/buyit/controller/web/servlet/ChangeAvatarServlet.java