benefit code
Merge branch 'master' of https://github.com/MFitness/CheerRun

Conflicts:
	res/layout/setting.xml
	src/tw/mfitness/cheerrun/FragmentSetting.java