solv conflict
Merge branch 'master' of https://github.com/shijingwang/python_tool.git

Conflicts:
	settings_local.py