Merge origin/master

Conflicts:
	src/main/webapp/appmenu.xhtml
	src/main/webapp/office/Create.xhtml
	src/main/webapp/office/Edit.xhtml
	src/main/webapp/office/List.xhtml
	src/main/webapp/office/View.xhtml
Merge origin/master

Conflicts:
	src/main/webapp/appmenu.xhtml
	src/main/webapp/office/Create.xhtml
	src/main/webapp/office/Edit.xhtml
	src/main/webapp/office/List.xhtml
	src/main/webapp/office/View.xhtml
Merge origin/master

Conflicts:
	src/main/webapp/appmenu.xhtml
	src/main/webapp/office/Create.xhtml
	src/main/webapp/office/Edit.xhtml
	src/main/webapp/office/List.xhtml
	src/main/webapp/office/View.xhtml
Merge origin/master

Conflicts:
	src/main/java/com/synergytech/ims/controller/CategoryController.java
	src/main/java/com/synergytech/ims/facade/CategoryFacade.java
	src/main/webapp/category/Create.xhtml
	src/main/webapp/category/Edit.xhtml
	src/main/webapp/category/List.xhtml