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

Conflicts:
	faces-navigation.NavData
	src/main/resources/META-INF/persistence.xml
Merge origin/Phase-II-Sales-Implementation into Phase-II-Sales-Implementation

Conflicts:
	src/main/java/com/simphony/entities/Guide.java