Merge origin/Phase-II-Sales-Implementation into Phase-II-Sales-Implementation

Conflicts:
	src/main/java/com/simphony/entities/Workers.java
	src/main/java/com/simphony/managedbeans/GuideBean.java
	src/main/java/com/simphony/managedbeans/ReportsBean.java
	src/main/java/com/simphony/managedbeans/ReservationsBean.java
	src/main/java/com/simphony/managedbeans/WorkersBean.java
	src/main/webapp/catalogs/workers/add.xhtml
	src/main/webapp/catalogs/workers/list.xhtml