Merge origin/master

Conflicts:
	faces-navigation.NavData
	src/main/java/com/simphony/entities/WorkCenter.java
	src/main/webapp/catalogs/populations/list.xhtml