Merge branch 'release/0.3.0' into appsembler_master
fix for checking the allowed number of courses a user can create, bump to 0.3.1
Merge branch 'hotfix/0.3.1' into appsembler_master
Merge branch 'refs/heads/appsembler_master' into feature/2014_Spring

Conflicts:
	mediathread/course/views.py