transfer pages
Merge remote-tracking branch 'origin/master' into guocheng

Conflicts:
	res/values/strings.xml