add tooltip to attach file icon
change mailer subject
move the js back
Merge branch 'master' of github.com:loomio/loomio into tooltip-on-attach-file-icon
Merge pull request #1189 from loomio/request-membership-mailer

[ready to merge] change request membership mailer subject
Merge pull request #1185 from loomio/tooltip-on-attach-file-icon

user sees tooltip when hovering on attach file icon
improve invitation flow
Merge pull request #1176 from loomio/invitation-ux

[ready] invitation flow easier for new users
new event for motion closed by user
Merge pull request #1180 from loomio/manual-outcome

[needs qa] close proposal manually
Merge branch 'master' of github.com:loomio/loomio into fix-motion-outcome-from-address

Conflicts:
	lib/tasks/upgrade_tasks.rake
	spec/services/motion_service_spec.rb