replacing text-buttons on settings-pages with icon-buttons from fontawesome
small bug-fixes regarding .xhtml-files
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/beans/CategoryService.java
	src/beans/PictureService.java
	src/beans/UserSettingsBean.java
	web/editproducts.xhtml
	web/upload.xhtml
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/beans/AdminSettingsService.java