Merge pull request #6 from cristiroma/1888_features2disk

refs #1888 - Synced cms.country with production settings
Merge pull request #7 from cristiroma/master

Synced with CMS production and removed the views from feature