一大堆改动，都是转实际的状态

此处省略一万字......
Merge remote-tracking branch 'origin/master'

Conflicts:
	JianGuo_Git/gen/com/nut/activity/R.java