added the option of using S3 for storing static files (other settings in the mediathread-openshift-quickstart repo)
using a newer version of django compressor, minify css files
fix for the login view (call to action additions)
first version of the template show when you're not in any course
removed auto adding the user to the sample course
style changes to "no courses" page
Merge pull request #27 from appsembler/feature/137-use-django-storages-for-s3

#137 - use django storages for S3 static file serving
added join sample course view
Merge branch 'refs/heads/appsembler_develop' into feature/146-sample-course-enroll-option

Conflicts:
	requirements/base.txt
added tests for the no courses/join sample course functionality
test fixes
added analytics calls for instructors
added mocks for tests
remove "create course" call to action on the welcome screen
fixed json serialization fix for email
south migration for tests must be enabled
Merge branch 'refs/heads/appsembler_develop' into feature/146-sample-course-enroll-option
Merge branch 'refs/heads/appsembler_develop' into feature/148-fix-sending-the-user-type
Merge pull request #29 from appsembler/feature/148-fix-sending-the-user-type

#148 - Fix sending the instructor user type to segment.io
Merge branch 'refs/heads/appsembler_develop' into feature/146-sample-course-enroll-option

Conflicts:
	mediathread/course/tests/test_views.py