added comments
Merge branch 'master' of https://github.com/basl/social

Conflicts:
	Sources/Communication/CLRosterController.m