Merge origin/master

Conflicts:
	src/main/java/com/synergytech/ims/controller/ItemsController.java
	src/main/java/com/synergytech/ims/facade/StoreFacade.java
Merge origin/master

Conflicts:
	src/main/java/com/synergytech/ims/controller/ItemsController.java
	src/main/java/com/synergytech/ims/facade/StoreFacade.java