Reverting to Matt's previous revision
Merge branch 'develop' of github.com:blueriver/MuraCMS into develop
Removing cache capacity option in site settings
Merge branch 'develop' of github.com:blueriver/MuraCMS into develop
Merge branch 'develop'