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
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
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
Merge pull request #28 from appsembler/feature/146-sample-course-enroll-option

#146 - Sample course enroll option
fix organization name sending to segment.io
Merge branch 'refs/heads/appsembler_develop' into feature/147-limit-student-invites

Conflicts:
	media/css/mediathread.css
	mediathread/course/tests/test_views.py
	mediathread/settings_shared.py
	mediathread/templates/base.html