server
Merge branch 'master' of github.com:konglingkai/Projects
merge
Merge branch 'master' of github.com:konglingkai/Projects

Conflicts:
	maimaiti/maimaiti/settings.py