修改：      cms_test/database.sqlite
	修改：      cms_test/settings.py
	修改：      cms_test/settings.pyc
	wsgi_app.py
	新文件：    wsgi_app.py
Merge branch 'master' of https://github.com/lazygunner/myt_cms

Conflicts:
	cms_test/settings.pyc