add
add
add
add
add
add
合并master
更新布局
1.Merge branch 'master' into chenxy

Conflicts:
	gen/net/yaopao/activity/R.java
	src/net/yaopao/activity/MainActivity.java