push falin
Merge branch 'master' of https://github.com/wiznuq/RunningCoach.git

Conflicts:
	bin/RunningCoach.apk
	bin/classes.dex
	bin/classes/com/cryingonion/runningcoach/HeartRateFragment.class
	bin/classes/com/cryingonion/runningcoach/HistoryFragment.class
	bin/classes/com/cryingonion/runningcoach/LetsRunFragment.class
	bin/classes/com/cryingonion/runningcoach/LoginActivity.class
	bin/classes/com/cryingonion/runningcoach/MainActivity.class
	bin/classes/com/cryingonion/runningcoach/PersonalCoachFragment.class
	bin/classes/com/cryingonion/runningcoach/SettingFragment.class
	bin/classes/com/cryingonion/runningcoach/SignUpActivity.class
	bin/classes/com/cryingonion/runningcoach/WhatsHotFragment.class
	bin/classes/com/cryingonion/runningcoach/adapter/NavDrawerListAdapter.class
	bin/resources.ap_
	gen/com/cryingonion/runningcoach/R.java
	project.properties
	src/com/cryingonion/runningcoach/LetsRunFragment.java
commit
merge