Merge origin/master

Conflicts:
	src/main/java/com/synergytech/ims/controller/ItemsController.java
	src/main/java/com/synergytech/ims/entities/Office.java
	src/main/java/com/synergytech/ims/entities/Supplier.java
Merge origin/master
Merge origin/master

Conflicts:
	src/main/java/com/synergytech/ims/controller/ItemsController.java
	src/main/java/com/synergytech/ims/entities/Office.java
	src/main/java/com/synergytech/ims/entities/Supplier.java
Merge origin/master

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

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