ciao
ciao
Merge branch 'dev' of https://github.com/andreamontanari/MadeInItaly into dev

Conflicts:
	webstore/src/main/webapp/WEB-INF/faces-config.xml
	webstore/src/main/webapp/jsf/products/news.xhtml
	webstore/src/main/webapp/jsf/products/products.xhtml
	webstore/src/main/webapp/resources/js/bootstrap.js
	webstore/src/main/webapp/resources/js/bootstrap.min.js
	webstore/src/main/webapp/resources/js/jquery.js
	webstore/src/main/webapp/stores.xhtml
	webstore/target/maven-archiver/pom.properties
	webstore/target/webstore-1.0.war
	webstore/target/webstore-1.0/WEB-INF/faces-config.xml
	webstore/target/webstore-1.0/jsf/products/news.xhtml
	webstore/target/webstore-1.0/jsf/products/products.xhtml
	webstore/target/webstore-1.0/stores.xhtml