Disable caching for catalog and article pages
Catalog refactoring
Updated article view template
Merge remote-tracking branch 'origin/master'