fref #47 bug on upload pic and editItem
Merge branch 'master' of https://github.com/Adi3000/latroquette.git

Conflicts:
	src/main/java/net/latroquette/common/database/data/file/Files.java
	src/main/java/net/latroquette/web/beans/item/ItemBean.java
	src/main/java/net/latroquette/web/beans/profile/UserBean.java
	src/main/java/net/latroquette/web/servlet/ImageServlet.java
	src/main/webapp/item/editItem.xhtml