commit to pull chat changes
Merge branch 'master' of https://github.com/naomihimley/PubChatter

Conflicts:
	PubChatter/ProfileViewController.m
Merge branch 'master' of https://github.com/naomihimley/PubChatter
adding a method to try to keep user from being added to bars multiple times