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
submissions work in progress
 mailers are working, craft attributes are added, forms appear to be correct. going to start working on tool tips
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
Merging all updates