重构布局，加入新的LOGO和动画、
Merge remote-tracking branch 'origin/master'

Conflicts:
	res/layout/main.xml