starting mailgun, refactor migrations
migrations
replacing pipeline with compressor
squashed team migration
Merge branch 'master' into refactor

Conflicts:
	www/settings.py
resolved conflict in settings.py
changed requirements
put back in crucial stuff for Django CMS

stupid mistake
Merge branch 'refactor'