added test
Merge commit '8486fdc88e2ab1b63f420b4875c2ef25e1ad566a'
Merge branch 'master' of git://github.com/MorseProject/XMPPFramework

Conflicts:
	Extensions/XEP-0060/XMPPPubSub.m
addressed build warning
fixing bug
Merge branch 'develop'

Conflicts:
	Extensions/XEP-0060/XMPPPubSub.m