Setup Setting Activity
Merge branch 'master' of git@github.com:wiznuq/RunningCoach.git

Conflicts:
	bin/RunningCoach.apk
	bin/classes.dex
	bin/classes/com/cryingonion/runningcoach/MainActivity$1.class
	bin/classes/com/cryingonion/runningcoach/MainActivity.class
	bin/resources.ap_
	src/com/cryingonion/runningcoach/MainActivity.java