cp, bnl

Signed-off-by: Damiano Zaccaria <damiano.zaccaria@neperiagroup.com>
Merge branch 'master' of https://github.com/NeperiagroupRagusa/prototype

Conflicts:
	cariparma/css/style.main.css
	cariparma/js/document.ready.js