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
Participant index only shows participants with tickets
submissions work in progress
 mailers are working, craft attributes are added, forms appear to be correct. going to start working on tool tips
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
Merge pull request #55 from sebarmano/release-1

Removed tickets types with total 0 from views
Merge remote-tracking branch 'upstream/release-1' into release-1
it should be working
Merge pull request #56 from jcward10/release-1

the working model
landing page done
fixed merge conflicts
Merge pull request #57 from obeid/release-1

landing page is now included
Merge remote-tracking branch 'upstream/release-1' into release-1