Work on wiki template.
Working on wiki documentation
Merge branch 'origin/develop'