Adjust dragonfly settings
Dropbox, Dragonfly adjustment
Minor adjustment to dragonfly
fix small change from heroku error
tweak to ternary
Merge remote-tracking branch 'upstream/release-1'
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 remote-tracking branch 'upstream/release-1' into release-1
Minor changes to participant form
Remove old merge conflict submissions
Merge pull request #110 from dazm12/release-1

Dropbox added, views tweaked