django-colorful replace twentytab-colorful
Merge branch 'master' of github.com:20tab/twentytab_project

Conflicts:
	requirements.txt