Created Wiki Controller
Merge branch 'develop'