WIP ticket booth view
Merge remote-tracking branch 'upstream/release-1' into release-1-ticket-booth

Conflicts:
	Gemfile
	Gemfile.lock
	app/controllers/participants_controller.rb
	app/models/participant.rb
Merge remote-tracking branch 'upstream/release-1' into release-1-ticket-booth

Conflicts:
	app/models/participant.rb
	app/models/ticket.rb
updated mailers
testing don't merge
updated submissions mailer
testing push request
edited mailer
WIP booth views
Merge remote-tracking branch 'upstream/release-1' into release-1-ticket-booth

Conflicts:
	app/models/fest_participant_submission.rb
	app/models/fest_participation_submission.rb
	app/models/fest_participation_submissions.rb
Merge branch 'release-1' of https://github.com/festivit/festivit into submission_mailer
Fixed table names and added seed data. WIP in participants index and show views.
deleted will call unused view
Merge branch 'release-1-ticket-booth' into release-1
Merge pull request #23 from sebarmano/release-1

Added seed data, fixed some fields names, WIP ticket booth views
Merge branch 'release-1' of https://github.com/festivit/festivit into submission_mailer
added columns to submission and attachments
Merge pull request #24 from rscottbradshaw/applications

added columns to submissions and attachments for applications
Basic functionality of ticket booth working
Merge branch 'release-1-ticket-booth' into release-1