Complete update
Merge branch 'django-cms' of github.com:TrioTorus/django-project-skel into django-cms

Conflicts:
	requirements.txt