Merge origin/master

Conflicts:
	web/index.xhtml
Merge origin/master

Conflicts:
	web/index.xhtml
Merge origin/master

Conflicts:
	src/java/DTOConverter/DTOConverter.java
	src/java/Exception/ProductException.java
	src/java/Interface/ApInterface.java
	src/java/Interface/ApRest.java
	src/java/Interface/ApSoap.java
	src/java/controller/SearchController.java
	src/java/controller/Settings.java
	src/java/pojos/Product.java
	web/index.xhtml
	web/resources/css/jsfcrud.css
	web/template.xhtml