Merge branch 'master', remote-tracking branch 'origin'
Added Disqus support to the Tool view template.