For transmit
Merge branch 'master' of https://github.com/VladAbramov/work-project

Conflicts:
	src/main/java/by/premiya/olga/project/controller/AdminEditorController.java
	src/main/java/by/premiya/olga/project/dao/ProductionDao.java
	src/main/java/by/premiya/olga/project/dao/impl/ProductionDaoImpl.java
	src/main/java/by/premiya/olga/project/entity/Wheel.java
	src/main/java/by/premiya/olga/project/service/impl/ProductServiceImpl.java
	src/main/java/by/premiya/olga/project/util/json/EntityPropertiesLoader.java
	src/main/java/by/premiya/olga/project/util/json/NewItemJSON.java
	src/main/webapp/WEB-INF/pages/adminShow.jsp
	src/main/webapp/assets/css/custom.css
	src/main/webapp/assets/js/adminShow.js