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.
[#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
[#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.