Upgrade and bugfix
Update dependencies
Merge branch 'refs/heads/feature/jabber'

Conflicts:
	composer.lock
Removed crap