cart
cart
cart
cart
cart
cart
cart
cart
Merge origin/Cool into Cool

Conflicts:
	artecom/artecom-war/web/template/sidebar.xhtml
	artecom/artecom-war/web/template/sidebar_1.xhtml