Adjust dragonfly settings
Dropbox, Dragonfly adjustment
Minor adjustment to dragonfly
fix small change from heroku error
edit participant view to show make email required.
tweak to ternary
Merge remote-tracking branch 'upstream/release-1'
deleted ds_store
Merge branch 'release-1' of https://github.com/festivit/festivit into allimporters
Move comments to applicant
Fix merge conflict submissions
Merge remote-tracking branch 'upstream/release-1' into release-1
Fix submission show merge
Fix merge in user show
Merge branch 'dashboard' of https://github.com/festivit/festivit into dashboard
WIP: starting demo day importer
merged conflicts in participants form
fixed some inconsistencies in partials subviews and deleted unused bits
fixning merge
Merge remote-tracking branch 'upstream/dashboard' into dashboard