Merge branch 'kavitha' of github.com:kavithaRajagopalan/RapidFTR---Android into kavitha

Conflicts:
	RapidFTR-Android/src/main/java/com/rapidftr/model/Enquiry.java