Merge.
Merge branch 'master' of github.com:stianjensen/wikipendium.no

Conflicts:
	wikipendium/wiki/models.py