Add feature
Merge branch 'master' of https://github.com/magento-hackathon/FireGento_FlexCms