Update some old parts and added links to RapidFTR google group
[#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
[#1666] Mark/Maria: swap parentheses to a colonas a separator between child name and child id
use of parentheses conflicts with the way arabic reverses text direction
[#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
(Mingle#1849 Gurpreet): Added check for ensuring that during User add, if passwords dont match then error message should be shown. Also did the same for nil userid during password reset.
Added pry-debugger gem