Merged from master 70c3e1c8 Conflicts: app/helpers/application_helper.rb
Attach a file by drag & drop or click to upload
