Consume subscription notifications (for real; fix 85e5a94bc0776466d15c0a6efa3f6fa50088777d)

Signed-off-by: Daniele Ricci <daniele.athome@gmail.com>
Fix presence loop

Signed-off-by: Daniele Ricci <daniele.athome@gmail.com>

Conflicts:
	kontalk/xmppserver/component/c2s/component.py
Workaround presence subscription loop (fix #115)

Signed-off-by: Daniele Ricci <daniele.athome@gmail.com>
Merge branch 'staging' into production

Signed-off-by: Daniele Ricci <daniele.athome@gmail.com>

Conflicts:
	kontalk/xmppserver/component/c2s/resolver.py