Merge pull request #569 from farismosman/master

[#1875] Machaba/Faris | Added criteria to the enquiry. Code isn't sexy a...
[#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.