[#1899] Kavitha - git st
[#1861] Sanchari/Faris - Added <Solr_data_dir> to gitignore.
Merge branch 'master' of github.com:rapidftr/RapidFTR
Merge branch 'master' of https://github.com/kavithaRajagopalan/RapidFTR into kavithaRajagopalan-master
Merge branch 'master' of github.com:rapidftr/RapidFTR
Resolving conflicts