format by Xu yida
Merge branch 'master' of https://github.com/Patrick-Wang/TBEA_Repo

Conflicts:
	TBEA/BusinessPerformance/Android/SourceCode/dataviewer/res/values/dimens.xml
	TBEA/BusinessPerformance/Android/SourceCode/dataviewer/res/values/strings.xml