Setting solr service to be started on restart of system
Updating version number
Merge branch 'master' into 1.1.x