small change
Merge branch 'move_create_course' of github.com:coati-00/brownfield_django
found and fixed small problem in course activation javascript
Merge remote-tracking branch 'upstream/master'
not sure why but it seems the instructor email template was lost
forgot to add prob what happened before...
Merge pull request #16 from coati-00/master

bug fixes