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