11111
取消了项目依赖
111
修改了图表
Merge branch 'master' of https://github.com/mawujun1234/dispatch.git

Conflicts:
	emsmobile/plugins/com.phonegap.plugins.barcodescanner/src/android/LibraryProject/bin/captureactivity.jar