[#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
(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.
[#Fix] Faris/Sanchari - fixed failing build (hopefully).
Merge pull request #580 from gsluthra/Mingle_1849_Fix_Error_Messages_For_UserName_Password

(Mingle#1849 Gurpreet): Added proper error messages for password confirmation and blank userid
[#1899] Kavitha - git st
[#Fix] Faris - Downgraded cucumber.
Merge pull request #588 from farismosman/master

[#Fix] Faris - fixed failing build.
[#1861] Sanchari/Faris - Added <Solr_data_dir> to gitignore.
[#Fix] Faris - Removed reporter_details.
Merge branch 'master' of github.com:rapidftr/RapidFTR
[#Fix] Faris - Changed reporter_name into enquirer_name. Tagged integration tests as @wip.
Merge pull request #589 from farismosman/master

[#Fix] Faris - Removed reporter_details.
Merge pull request #576 from hundred/story_1666_child_name_in_arabic

[#1666] Mark/Maria: swap parentheses to a colon as a separator between ch...
Merge branch 'master' of https://github.com/kavithaRajagopalan/RapidFTR into kavithaRajagopalan-master
Merge branch 'master' of github.com:rapidftr/RapidFTR
Resolving conflicts
[#1907] Faris - Enquiry doesn't update when empty criteria is sent.
[#1907] Faris - Added test for nil criteria.
Merge pull request #591 from farismosman/master

[#1907] Faris - Enquiry doesn't update when empty or nil criteria is sent.
Sanchari/Kavitha - Fixed wip tests(#1861) and added feature file for checking matches on create/update enquiry(#1871)