Merge origin/master

Conflicts:
	pom.xml
	src/main/java/controller/Catalog.java
	src/main/java/controller/UploadImage.java
	src/main/java/model/Item.java
	src/main/resources/web/messages.properties
	src/main/webapp/WEB-INF/web.xml
	src/main/webapp/detail.xhtml
	src/main/webapp/index.html
	src/main/webapp/template.html
	src/main/webapp/upload.xhtml
	src/test/resources/scripts/catalog.sql