Changes to qff, reverted back to last years model, updated colors and information
Update festival description
Merge branch qff-14
Resolve merge conflict