echarts update
Modified by Xu yida
Rm png by Xu yida
Merge remote-tracking branch 'origin/master'

Conflicts:
	TBEA/BusinessPerformance/Android/SourceCode/dataviewer/.classpath
	TBEA/BusinessPerformance/Android/SourceCode/dataviewer/bin/res/drawable-hdpi/detailstitle_bk.png
	TBEA/BusinessPerformance/Android/SourceCode/dataviewer/bin/res/drawable-hdpi/detailstitle_center.png
	TBEA/BusinessPerformance/Android/SourceCode/dataviewer/bin/res/drawable-hdpi/func1.png
	TBEA/BusinessPerformance/Android/SourceCode/dataviewer/bin/res/drawable-hdpi/func2.png
	TBEA/BusinessPerformance/Android/SourceCode/dataviewer/bin/res/drawable-hdpi/func3.png
	TBEA/BusinessPerformance/Android/SourceCode/dataviewer/bin/res/drawable-hdpi/ic_launcher.png
	TBEA/BusinessPerformance/Android/SourceCode/dataviewer/bin/res/drawable-hdpi/logintitle.png
	TBEA/BusinessPerformance/Android/SourceCode/dataviewer/bin/res/drawable-hdpi/logintitle_left.png
	TBEA/BusinessPerformance/Android/SourceCode/dataviewer/bin/res/drawable-hdpi/logintitle_right.png
	TBEA/BusinessPerformance/Android/SourceCode/dataviewer/bin/res/drawable-mdpi/ic_launcher.png
	TBEA/BusinessPerformance/Android/SourceCode/dataviewer/bin/res/drawable-xhdpi/detailstitle_bk.png
	TBEA/BusinessPerformance/Android/SourceCode/dataviewer/bin/res/drawable-xhdpi/detailstitle_center.png
	TBEA/BusinessPerformance/Android/SourceCode/dataviewer/bin/res/drawable-xhdpi/func1.png
	TBEA/BusinessPerformance/Android/SourceCode/dataviewer/bin/res/drawable-xhdpi/func2.png
	TBEA/BusinessPerformance/Android/SourceCode/dataviewer/bin/res/drawable-xhdpi/func3.png
	TBEA/BusinessPerformance/Android/SourceCode/dataviewer/bin/res/drawable-xhdpi/ic_launcher.png
	TBEA/BusinessPerformance/Android/SourceCode/dataviewer/bin/res/drawable-xhdpi/logintitle.png
	TBEA/BusinessPerformance/Android/SourceCode/dataviewer/bin/res/drawable-xhdpi/logintitle_left.png
	TBEA/BusinessPerformance/Android/SourceCode/dataviewer/bin/res/drawable-xhdpi/logintitle_right.png
	TBEA/BusinessPerformance/Android/SourceCode/dataviewer/bin/res/drawable-xxhdpi/ic_launcher.png
	TBEA/BusinessPerformance/Android/SourceCode/dataviewer/bin/res/drawable/background.png
	TBEA/BusinessPerformance/Android/SourceCode/dataviewer/bin/res/drawable/bottom.png
	TBEA/BusinessPerformance/Android/SourceCode/dataviewer/bin/res/drawable/detailstitle_bk.png
	TBEA/BusinessPerformance/Android/SourceCode/dataviewer/bin/res/drawable/detailstitle_center.png
	TBEA/BusinessPerformance/Android/SourceCode/dataviewer/bin/res/drawable/func1.png
	TBEA/BusinessPerformance/Android/SourceCode/dataviewer/bin/res/drawable/func2.png
	TBEA/BusinessPerformance/Android/SourceCode/dataviewer/bin/res/drawable/func3.png
	TBEA/BusinessPerformance/Android/SourceCode/dataviewer/bin/res/drawable/login_n.png
	TBEA/BusinessPerformance/Android/SourceCode/dataviewer/bin/res/drawable/login_p.png
	TBEA/BusinessPerformance/Android/SourceCode/dataviewer/bin/res/drawable/loginarea.png
	TBEA/BusinessPerformance/Android/SourceCode/dataviewer/bin/res/drawable/logintitle.png
	TBEA/BusinessPerformance/Android/SourceCode/dataviewer/bin/res/drawable/logintitle_left.png
	TBEA/BusinessPerformance/Android/SourceCode/dataviewer/bin/res/drawable/logintitle_right.png
	TBEA/BusinessPerformance/Android/SourceCode/dataviewer/bin/res/drawable/refresh.png
	TBEA/BusinessPerformance/Android/SourceCode/dataviewer/bin/res/drawable/rightconer.png
	TBEA/BusinessPerformance/Android/SourceCode/dataviewer/bin/res/drawable/splash_screen.png
	TBEA/BusinessPerformance/Android/SourceCode/dataviewer/gen/com/example/dataviewer/R.java
	TBEA/BusinessPerformance/Android/SourceCode/dataviewer/src/com/dataviewer/FuturesChartPage.java
Function2 changed by Xu yida