Merge remote-tracking branch 'upstream/release-1' into release-1
Merge remote-tracking branch 'upstream/release-1' into release-1
Merge branch 'release-1' of https://github.com/festivit/festivit into release-1
Removed tickets types with total = 0 from participants show view
Merge pull request #49 from obeid/release-1

fixed top bar menu alignment issue and overlap
Participant index only shows participants with tickets
merging
resolve merge conflicts
added group_name to seed data
submissions work in progress
completed all the questions for forms
Merge pull request #50 from rscottbradshaw/applications

added group_name to seed data
Merge pull request #51 from rscottbradshaw/questionaire

Questionaire
 mailers are working, craft attributes are added, forms appear to be correct. going to start working on tool tips
Styling Dashboard View with Modals
Merge remote-tracking branch 'upstream/release-1' into release-1
Merge branch 'release-1-javascript-search' into release-1

Conflicts:
	app/models/participant.rb
	app/views/participants/index.html.slim
Add productpairsid to tickettypes
Merge pull request #52 from JParker85/release-1

Styling dashboard and creating Modals
Merge pull request #54 from maebeale/csvimport

Add productpairsid to tickettypes