added favorites
added favorites
Merge branch 'master' of https://github.com/SparkCompass/HIMSS_iOS

Conflicts:
	HIMSS.xcodeproj/project.pbxproj
	src/SJCollaboratorController.m