Merge branch 'hotfix/0.1.1' into appsembler_master
s3 fixes
Merge branch 'hotfix/0.1.2' into appsembler_develop

Conflicts:
	mediathread/templates/course/create.html
	mediathread/templates/user_accounts/invite_students.html