article list template changed
map fix
minor css fixes
Merge branch 'master' into catalog_templates
db relations fixed
Merge branch 'master' into catalog_templates
intermediate