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 pull request #103 from festivit/dashboard

Dashboard
Added limits for remaining change
added card colors
Fixed alignments of buttons and search field in participants index view
fixed partial search and capitalization
Merge remote-tracking branch 'upstream/release-1' into release-1

Conflicts:
	app/assets/stylesheets/participants.css.scss