1.5.0
1.6.0
1.7.0
Merge branch 'master' of github.com:xmpp-ftw/xmpp-ftw-buddycloud

Conflicts:
	package.json
1.8.0