新增变量
Merge branch 'xiaogang1.0'
Merge branch 'master' of https://github.com/commaforeverTeam/TeamHouseApp

Conflicts:
	TeamHouseApp/Classes/CustomNavigationController.h