Merge origin/master

Conflicts:
	src/main/java/com/synergytech/ims/controller/StoreController.java
	src/main/webapp/store/List.xhtml
Merge origin/master