refactoring
Merge branch 'master' of https://github.com/Scorpioncik/demoshop

Conflicts:
	demoshop-webapp/src/main/java/com/cazacioc/demoshop/controller/CategoryController.java
	demoshop-webapp/src/main/java/com/cazacioc/demoshop/controller/ProductController.java
	demoshop-webapp/src/main/java/com/cazacioc/demoshop/controller/RegistrationController.java
	demoshop-webapp/src/main/java/com/cazacioc/demoshop/controller/StockController.java
	demoshop-webapp/src/main/java/com/cazacioc/demoshop/controller/UserController.java
	demoshop-webapp/src/main/webapp/WEB-INF/views/add_category.jsp
	demoshop-webapp/src/main/webapp/WEB-INF/views/add_item.jsp
	demoshop-webapp/src/main/webapp/WEB-INF/views/add_stock.jsp
	demoshop-webapp/src/main/webapp/WEB-INF/views/category_list.jsp
	demoshop-webapp/src/main/webapp/WEB-INF/views/home.jsp
	demoshop-webapp/src/main/webapp/WEB-INF/views/product_list.jsp
	demoshop-webapp/src/main/webapp/WEB-INF/views/registration.jsp
	demoshop-webapp/src/main/webapp/WEB-INF/views/stock_list.jsp
	demoshop-webapp/src/main/webapp/WEB-INF/views/users_list.jsp
	demoshop-webapp/src/main/webapp/resources/css/style.css