If user has no affiliation we get an exception
Merge branch 'develop' of github.com:buddycloud/buddycloud-media-server into no-affiliation

Conflicts:
	src/main/java/com/buddycloud/mediaserver/xmpp/pubsub/PubSubClient.java
Add return statement
Merge pull request #89 from buddycloud/no-affiliation

If user has no affiliation we get an exception