update
Merge branch 'master' of https://github.com/aqaya/wujun

Conflicts:
	MyPythonTest/.settings/org.eclipse.core.resources.prefs