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

Conflicts:
	TBEA/BusinessPerformance/Android/SourceCode/dataviewer/gen/com/example/dataviewer/R.java
	TBEA/BusinessPerformance/Android/SourceCode/dataviewer/res/layout/cell.xml
	TBEA/BusinessPerformance/Android/SourceCode/dataviewer/res/values-sw600dp/dimens.xml
	TBEA/BusinessPerformance/Android/SourceCode/dataviewer/res/values-sw720dp-land/dimens.xml
	TBEA/BusinessPerformance/Android/SourceCode/dataviewer/res/values-v11/styles.xml
	TBEA/BusinessPerformance/Android/SourceCode/dataviewer/res/values-v14/styles.xml
	TBEA/BusinessPerformance/Android/SourceCode/dataviewer/res/values/dimens.xml
	TBEA/BusinessPerformance/Android/SourceCode/dataviewer/res/values/strings.xml
	TBEA/BusinessPerformance/Android/SourceCode/dataviewer/res/values/styles.xml
	TBEA/BusinessPerformance/Android/SourceCode/dataviewer/src/com/dataviewer/FunctionSelectorPage.java
	TBEA/BusinessPerformance/Android/SourceCode/dataviewer/src/com/dataviewer/QuotaTablePage.java