update
Merge branch 'master' of https://github.com/hailongz/vTeam

Conflicts:
	vTeam/vTeam/VTFoldViewController.m