update on strings
Merge branch 'master' of https://github.com/YGLiu/RunMyWay

Conflicts:
	res/values/strings.xml
Merge branch 'master' of https://github.com/YGLiu/RunMyWay
add loging page and main change in GUI