files changes for newer freedom release
Merge branch 'master' of https://github.com/freedomjs/freedom-social-xmpp into dborkan-chat

Conflicts:
	Gruntfile.js