Removed tickets types with total = 0 from participants show view
Participant index only shows participants with tickets
merging
resolve merge conflicts
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
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