Changed User and Wiki models
Merge branch 'develop'