[#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
[#1871] Faris/Kisitu - Built DisMax query.
[#1871] Faris/Kisitu - Added match functionality.
Merge branch 'master' of git://github.com/rapidftr/RapidFTR

Conflicts:
	Gemfile.lock
[#1871] Faris - Match is triggered whenever an enquiry is created.
[#1871] Faris - Match is triggered whenever an enquiry is updated.
[#1871] Kisitu/Faris - removed attribute reporter_details from enquiry. Model tests are passing.
[#1864] Kavitha/John - Enquiries can now be filtered by the match_updated_at field.
[#1871] Kisitu/Faris - Fixed controller test.
[#1871] Kisitu/Faris - Trying to fix failing tests.
[#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
[#1864] Kavitha/John - Enquiries api index now returns a list of resource urls.
new step file for enquiries added
new scenarios added to create_or_edit_enquiry.feature
Added images needed for documentation of Android IDE setup
[#1871] Kisitu/Faris - potential_matches contains only unique values. Also it removes record ids that don't match anymore after enquiry is updated.
Merge branch 'master' of git://github.com/rapidftr/RapidFTR

Conflicts:
	Gemfile
[#1871] Kisitu/Faris - potential_matches are ordered by solr scores -- default behaviour of solr.