修改导航可点击区域
Merge branch 'master' of
https://github.com/remembergrace-dev/jituofu_android.git

Conflicts:
	2.0/bin/classes.dex
	2.0/bin/resources.ap_
	2.0/res/layout/topbar2.xml
	2.0/res/layout/topbar4.xml