Attachments! :paperclip:
Merge branch 'master' of github.com:loomio/loomio into feature/file-upload

Conflicts:
	app/models/permitted_params.rb
Merge pull request #893 from loomio/feature/file-upload

[Ready once the tests pass] File Upload