Removed solr folder from repo
Added /solr folder to gitignore
merged master and removed all solr files