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

Conflicts:
	src/main/java/com/simphony/entities/Guide.java
Merge origin/Phase-II-Sales-Implementation into Phase-II-Sales-Implementation