Merge branch 'dev'
First updates for the live site
Added the live settings file
CSS and template updates
Updated css file
CSS improvements
Cleanup and css
Merge remote-tracking branch 'origin/live' into dev

Conflicts:
	educate/admin.pyc
	educate/models.pyc
	educate/urls.pyc
	educate/views.pyc