changed by sunfuda
changed by sunfuda

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

Conflicts:
	TBEA/BusinessPerformance/Android/SourceCode/dataviewer/src/com/webservice/Server.java
Merge branch 'master' of github.com:Patrick-Wang/TBEA_Repo
changed by sunfd
Merge branch 'master' of github.com:Patrick-Wang/TBEA_Repo
changed by sunfuda