Added new ConceptWiki uri pattern
Merge branch 'develop' into Christian