ok
Merge remote-tracking branch 'choose_remote_name/master'

Conflicts:
	zhwh/.settings/org.eclipse.core.resources.prefs
	zhwh/src/config/settings.pyc
	zhwh/src/config/urls.py
	zhwh/src/config/urls.pyc
	zhwh/src/controllers/user.py
	zhwh/src/controllers/user.pyc
	zhwh/src/controllers/zhjf.py
	zhwh/src/controllers/zhjf.pyc
	zhwh/src/zhwh.py
ok
ok
ok
ok