20140704 - 184425 Merge Look And Feel
Merge origin/master
20140711 - 010325 Catalog Class for extend others
Merge origin/master

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

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