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
merging
resolve merge conflicts
submissions work in progress
Merge branch 'release-1' of https://github.com/festivit/festivit into questionaire
Add feature spec folder
Merge remote-tracking branch 'upstream/release-1' into release-1
 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
Add some specs
Merge branch 'release-1-javascript-search' into release-1

Conflicts:
	app/models/participant.rb
	app/views/participants/index.html.slim
Change devise password length
Merge branch 'release-1' of https://github.com/festivit/festivit into questionaire
Merge pull request #52 from JParker85/release-1

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

Add productpairsid to tickettypes