10082014 13:21 Styles
15082014 21:58 Styles
Merge origin/Phase-II-Sales-Implementation into Phase-II-Sales-Implementation

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