Merging
Merging
merging
Settling Submissions view
Settling Submissions view
removed order model
merging to get updates
Merge branch 'release-1' of https://github.com/festivit/festivit into release-1
Merge pull request #24 from rscottbradshaw/applications

added columns to submissions and attachments for applications
Merge branch 'release-1' of https://github.com/festivit/festivit into participants
fixed: submissions, show page after submitting application
Basic functionality of ticket booth working
Merge branch 'release-1-ticket-booth' into release-1
Merge pull request #25 from sebarmano/release-1

Ticket booth basic functionality working
built basic ticket importer.
fixed more template layoout glitches and deleted global styles
Merge branch 'release-1' of github.com:festivit/festivit into release-1
resolving problems
Merge remote-tracking branch 'upstream/release-1' into release-1
update submission form