residual vish work
Merge branch 'master' of github.com:ging/social_stream
Merge branch 'master' of github.com:ging/social_stream
Merge branch 'master' of github.com:ging/social_stream
adjust
fix merge
erase lost partial
adjust from fiware-idm
somme adjust
new translations
Sync with new translations from 1-stable
Remove binding.pry call
Remove rooms along with their owners

Fixes #440
Add license to gemspec, is MIT. Universidad Politécnica de Madrid
Merge pull request #444 from bf4/add-license-to-gemspe

[#443] Add license to gemspec, is MIT. Universidad Politécnica de Madrid
refresh work
Merge branch 'master' of github.com:ging/social_stream
Some fixes in site client edit

Fixes ging/fi-ware-idm#12
Add custom notification email settings

Closes: #445, #266

Conflicts:
	base/config/locales/en.yml
Modify gemspec to use compatible mailboxer