add finish running page
add finish running page
Add Login Page
Merge branch 'master' of https://github.com/rufuslee/MusicRunner

Conflicts:
	app/src/main/AndroidManifest.xml
	app/src/main/res/values/strings.xml
eliminate duplicate string value
Change to right google play service number