make image attachments less than 1MB display inline
Revert "remove wall, include new language" & Revert "update language"

This reverts commit 9f7cb4d3b5d4d97aa0280ba7ba675f73d9aa57c1.

Conflicts:
	app/views/pages/pricing.html.haml
Merge pull request #1053 from loomio/revert_payment

Revert "remove wall, include new language" & Revert "update language"
Fix motion closed notifications
Populate inviter when adding user to subgroup
Merge pull request #1054 from loomio/bug/motion-closed-notifications

Fix motion closed notifications
Merge pull request #1052 from loomio/bug/populate-inviter-on-membership

Populate inviter when adding user to subgroup
Merge pull request #1044 from loomio/feature/inline-image-attachment--plain-comment

[Reviewed, NEEDS QA] add image display to comment attachments
remove wall, include new language
Merge pull request #1056 from loomio/feature/payment

remove wall, include new language
Merge branch 'master' of github.com:loomio/loomio into segmentio-new
updated to production ready segmentio api key and uncommented production if statement