Fix bug 856124: Use Django's X-Frame-Options middleware.
Merge pull request #1017 from ubernostrum/x-frame-options-856124

Fix bug 856124: Use Django's X-Frame-Options middleware.