Version 1
Merge branch 'master' of https://github.com/leetncamp/django_insertwiki