Apply In-Reply-To header for discussion thread emails
Merge pull request #1683 from loomio/email-threading-fix

Apply In-Reply-To header for discussion thread emails
Add ability to restore memberships when reactivating users
Merge pull request #1685 from loomio/reactivate-users

Add ability to restore memberships when reactivating users
Merge branch 'master' into bootstrap3-upgrade
remove some crazy css