don't konw
Merge branch 'master' of https://github.com/Maizhi/maizhi

Conflicts:
	courses/urls.pyc
	courses/views.pyc