nn
Merge origin/Cool into Cool

Conflicts:
	artecom/artecom-war/web/template/header.xhtml
Merge origin/Cool into Cool

Conflicts:
	artecom/artecom-war/web/template/header.xhtml
Merge origin/Cool into Cool

Conflicts:
	artecom/artecom-war/web/template/header.xhtml
Merge origin/Cool into Cool

Conflicts:
	artecom/artecom-war/web/template/header.xhtml
Merge origin/Cool into Cool

Conflicts:
	artecom/artecom-war/web/template/header.xhtml
Merge origin/Cool into Cool

Conflicts:
	artecom/artecom-war/web/template/header.xhtml
Merge origin/Cool into Cool

Conflicts:
	artecom/artecom-war/web/template/header.xhtml
Merge origin/Cool into Cool

Conflicts:
	artecom/artecom-war/web/template/header.xhtml
Merge origin/Cool into Cool

Conflicts:
	artecom/artecom-war/web/template/header.xhtml
Merge origin/Cool into Cool

Conflicts:
	artecom/artecom-war/web/template/header.xhtml
Merge origin/Cool into Cool

Conflicts:
	artecom/artecom-war/web/template/header.xhtml
Merge origin/Cool into Cool

Conflicts:
	artecom/artecom-war/web/template/header.xhtml
Merge origin/Cool into Cool

Conflicts:
	artecom/artecom-war/web/template/header.xhtml
Merge origin/Cool into Cool

Conflicts:
	artecom/artecom-war/web/template/header.xhtml
Merge origin/Cool into Cool

Conflicts:
	artecom/artecom-war/web/template/header.xhtml
Merge origin/Cool into Cool

Conflicts:
	artecom/artecom-war/web/template/header.xhtml
Merge origin/Cool into Cool

Conflicts:
	artecom/artecom-war/web/template/header.xhtml
Merge origin/Cool into Cool

Conflicts:
	artecom/artecom-war/web/template/header.xhtml
Merge origin/Cool into Cool

Conflicts:
	artecom/artecom-ejb/src/java/model/entity/Cart.java