X-Frame-Options, Content-Security-Policy
Merge pull request #615 from patriot1burke/master

X-Frame-Options, Content-Security-Policy