fix bug 855714 - Restore previous editor scrolling behavior
fix profile edit with csrf element
Merge pull request #966 from groovecoder/edit-profile-csrf

fix profile edit with csrf element
fix move document with csrf token
Merge pull request #967 from groovecoder/move-doc-csrf

fix move document with csrf token
fix bug 854392 - Move fonts css file
Enable USE_X_FORWARDED_HOST by default
Merge pull request #969 from lmorchard/use-x-forwarded-host

Enable USE_X_FORWARDED_HOST by default
Merge pull request #964 from darkwing/scrolling-855714

fix bug 855714 - Restore previous editor scrolling behavior
Merge pull request #968 from darkwing/fonts-854392

fix bug 854392 - Move fonts css file
Merge pull request #965 from ethertank/master

Update html5.js
fix django admin statics
Fix bug 856019, Localization/format order.
Merge pull request #973 from jsocol/search

Fix bug 856019, Localization/format order.
Merge pull request #971 from groovecoder/django-admin-static

fix django admin statics
Merge remote-tracking branch 'remotes/fm/master'