change setting layout
Merge branch 'master' of https://github.com/MFitness/CheerRun

Conflicts:
	project.properties