Redesign Final
Merge branch 'Redesign'

Conflicts:
	cet/feed/models.py
	templates/cet/dashboard_profile.html