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 branch 'dashboard' of https://github.com/festivit/festivit into dashboard
fixed some inconsistencies in partials subviews and deleted unused bits
fixning merge
Merge remote-tracking branch 'upstream/dashboard' into dashboard
Merge pull request #106 from JustinRParker/dashboard

Dashboard fix
 fixed decline
Setting up accept and decline buttons based on submission.approve
Merge remote-tracking branch 'upstream/dashboard' into dashboard
Merge pull request #107 from JustinRParker/dashboard

Setting up accept and decline buttons based on submission.approve