Merge branch 'master' into develop
Merge branch 'master' of https://github.com/cloud66/help into develop
added search tag for indexing