fixes
Merge branch 'master' of github.com:Alerion/django_documentation

Conflicts:
	locale/ru/LC_MESSAGES/howto/custom-model-fields.po