new commit
new commit
Merge origin/master

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

Conflicts:
	src/main/webapp/storein/List.xhtml