Merge branch 'hotfix/1.3.1' into develop
Upgraded site to Django 1.5 and fixed an issue with the Disqus integration
Fixed a deprecation warning
Merge branch 'release/1.4.0'