update UI
Merge branch 'master' of https://github.com/GloriaGuo/BabyMall

Conflicts:
	res/layout/title.xml
	res/values/strings.xml