Merge branch 'develop' into 008-solr-knowledge
SOLR manual index added
Merge branch '008-solr-knowledge' into develop