Merge origin/master

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