Merged #165 "Fix flash security risk"
Specify response header X-Frame-Options SAMEORIGIN for generated pages
Merge branch 'ticket/166' into develop