Merge branch 'guangzi'
liufaliang 14-1-7
Merge branch 'master' of https://github.com/commaforeverTeam/TeamHouseApp

Conflicts:
	TeamHouseApp.xcodeproj/project.pbxproj