Fetch Roster from XMPP server + update contacts
Clean up
Return new contacts
Merge branch 'master' into roster_sync

Conflicts:
	lib/och/push/get.php
Add new XMPP contacts as conversation
Use roster to add new convs
log raw data
Use _processroster for all roster updates
remove contact when it's deleted in the roster
Create array with barejids
Don't remove contacts
Make BOSH_URL a config parameter + handle errors
Fix issue when there are multiple addressbooks
Add button to add contacts to the roster
Merge remote-tracking branch 'origin/roster_sync'

Conflicts:
	.gitignore