Implement user-facing account deactivation
update gemfile
Update en.yml
branch 'master' of github.com:loomio/loomio
fix bug that comments from email are not marked as read
fix specs
Merge pull request #1658 from loomio/bug-mark-email-comment-as-read

fix bug that comments from email are not marked as read
Merge branch 'account-deactivation'

Conflicts:
	app/assets/stylesheets/unstructured/_users.css.scss
ok
fix fontawesome
mark as viewed with correct time
language esperanto frontpage
Merge pull request #1660 from loomio/language_update

language esperanto frontpage
ressurcetion
Fix data-confirm in admin panel
Merge pull request #1662 from loomio/fix-data-confirm

Fix data-confirm in admin panel
schema
Merge branch 'master' of github.com:loomio/loomio
FIX THE SPECSSSSSS
Merge pull request #1661 from loomio/resurrect-inbox

ressurcetion