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
[#1871] Kavitha/Faris | Upgraded sunspot_solr to 2.0.0. Added a method to test the dismax search.
Merge branch 'master' of git://github.com/rapidftr/RapidFTR
Adding Pry to gemfile
Merge pull request #575 from sriprasanna/master

Added Pry to gemfile
[#1871] Faris/Kisitu - Built DisMax query.
[#1875] John/Kavitha - Added test for malformed json handling and improved error message.
Merge pull request #577 from johncowie/master

[#1875] John/Kavitha - Added test for malformed json handling and improv...
[#1875] John/Kavitha - Added test for malformed json handling and improved error message.
[#8164] Kavitha/John - Enquiries API can now return all enquiries and enquiry by ID.
John - Child API now returns empty body (not 'null') with 404 if child record is not found.
Merge remote-tracking branch 'upstream/master'
John - Fixed incorrect method call in database teardown
Merge pull request #578 from johncowie/master

#1864 - Enquiry API can now list all records and individual records.
[#1871] Faris/Kisitu - Added match functionality.
Merge branch 'master' of git://github.com/rapidftr/RapidFTR

Conflicts:
	Gemfile.lock