utf8
utf8fix
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/java/component/controller/ProjectController.java
	src/main/java/entity/FurnitureItem.java
	src/main/java/entity/WallItem.java
	src/main/webapp/WEB-INF/views/front/general/errorPage.jsp
	src/main/webapp/WEB-INF/views/front/pages/apiDocs.jsp
	src/main/webapp/WEB-INF/views/front/pages/apiDocsSidebar.jsp
	src/main/webapp/WEB-INF/views/front/pages/project/projectCreator.jsp
	src/main/webapp/WEB-INF/views/front/pages/project/projectEditor.jsp
	src/main/webapp/WEB-INF/views/front/pages/project/projectErrorPage.jsp
	src/main/webapp/WEB-INF/views/front/pages/project/projectList.jsp
	src/main/webapp/WEB-INF/views/front/pages/project/projectListSidebar.jsp
	src/main/webapp/WEB-INF/views/front/pages/project/projectViewer.jsp
	src/main/webapp/WEB-INF/views/front/templates/projectCreator.jsp
	src/main/webapp/resources/css/style.css
	src/main/webapp/resources/img/data/home-slider/slide-1.jpg
	src/main/webapp/resources/img/data/home-slider/slide-2.jpg
	src/main/webapp/resources/img/data/home-slider/slide-3.jpg
	src/main/webapp/resources/img/grid.png
	src/main/webapp/resources/js/creator.js
	src/main/webapp/resources/js/jquery.overscroll.min.js
utf8-fix
utf8-fix
utf8 fix
project adding fix
item adding
fix
add and delete