modify membership_request view to announce no pending requests
change 'from' on invitation to group email
Add email templates feature
fix position statement character counter
Merge pull request #994 from loomio/feature/email-templates

Add email templates feature
Merge pull request #996 from loomio/bug/position-statement-character-counter

Fix position statement character counter
Merge pull request #964 from loomio/reply-to-invitation

change 'from' on invitation to group email
quick fix: enable edit title after strong params introduced
Merge branch 'master' of github.com:loomio/loomio
Merge pull request #951 from loomio/fix/empty-membership-request-view

modify membership_request view to announce no pending requests
Auto add existing users to group on invitation
Merge pull request #973 from loomio/feature/add-existing-users

auto-add users to group
Merge branch 'master' of github.com:loomio/loomio into feature/file-upload

Conflicts:
	Gemfile
	db/schema.rb
Merge branch 'master' of github.com:loomio/loomio into feature/file-upload

Conflicts:
	db/schema.rb
holla