changed by sunfuda
changed by sunfuda
Merge branch 'master' of github.com:Patrick-Wang/TBEA_Repo

Conflicts:
	TBEA/BusinessPerformance/Android/SourceCode/dataviewer/src/com/dataviewer/HomePage.java
	TBEA/BusinessPerformance/Android/SourceCode/dataviewer/src/com/javaBean/QHMXBean.java