fixing stupid commit directly to master
Merge branch 'rbanffy-develop' into feature/rbanffy-merge
Change CNN rule to affect their Disqus threads.
Merge branch 'feature/rbanffy-merge' into develop