[#1861] Machaba/Faris | Refactored enquiries_controller#create to make it more readable
[#1861] Machaba/Faris | Modified enquiries_controller#update.
[#1861] Machaba/Faris | criteria in Enquiry model is merged instead of overridden.
Merge pull request #570 from farismosman/master

[#1861] Update Enquiry to merge.
[#1861] Faris | fixed update to use params instead of params['enquiry'].
[Defect] Kisitu/Faris | Handled malformed queries.
[#1861] Kisitu/Faris | Added reporter_details to enquiry and added validations.
Merge pull request #571 from farismosman/master

[#1875] Adding more fields to enquiry
[#1861] Fixed error message when creating/updating enquiries.
Merge pull request #573 from farismosman/master

[#1861] Fixed error message when creating/updating enquiries.
file renamed from create_enquiry.feature to create_or_edit_enquiry.feature and step file modified to test for JSON error
Sanchari | Added functional tests for editing enquiry
Merge branch 'master' into fix_api_tests
Merge pull request #574 from san8888/fix_api_tests

Filename changed from create_enquiry to create_or_edit_enquiry and new scenarios added