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
Merge conflicts with everyone updating
Merge pull request #59 from rscottbradshaw/release-1

Updated forms