Update SOLR folder
Remove horizontal line in prompt
Merge branch 'master' into use_rvm