Updated disqus commenting, so that there is 1 disqus thread per article
Merge remote-tracking branch 'upstream/master' into outside_resources

Conflicts:
	src/client/controllers/article.coffee
Merge pull request #31 from mancabizjak/outside_resources

Updated disqus commenting