added solr to project
merged js changes