Merge branch 'master' of https://github.com/larjia/mydms

Conflicts:
	mydms/settings.py
	mydms/urls.py