Merge origin/master

Conflicts:
	src/main/webapp/store/List.xhtml
	src/main/webapp/store/index.xhtml
Merge origin/master
Merge origin/master

Conflicts:
	src/main/webapp/store/List.xhtml
	src/main/webapp/store/index.xhtml