new step file for enquiries added
[#1871] Kisitu/Faris - Trying to fix failing tests.
new scenarios added to create_or_edit_enquiry.feature
Merge branch 'master' into api_edgecase_scenarios
Merge pull request #579 from san8888/api_edgecase_scenarios

Api edgecase scenarios
[#1871] Kisitu/Faris - Added before_save filter to add id's of matching records. Refactored controller and fixed some failing tests.
Merge branch 'master' of git://github.com/rapidftr/RapidFTR