Merge branch 'release-1' of https://github.com/festivit/festivit into questionaire
Merge branch 'release-1' of https://github.com/festivit/festivit into questionaire
updated forms
Editing Modals
Merge remote-tracking branch 'upstream/release-1' into release-1
Merge conflicts with everyone updating
Merge pull request #58 from JParker85/release-1

Editing Modals
Merge remote-tracking branch 'upstream/release-1' into release-1
Merge pull request #59 from rscottbradshaw/release-1

Updated forms
Merge remote-tracking branch 'upstream/release-1' into release-1
View adjustments