commit
Merge remote-tracking branch 'origin/zxdx2.0' into zxdx2.0
修复navigationbar的继承问题