adding tab content for flex cms form
Merge branch 'master' of https://github.com/magento-hackathon/FireGento_FlexCms

Conflicts:
	src/app/code/community/Firegento/FlexCms/etc/config.xml
Merge branch 'master' of https://github.com/magento-hackathon/FireGento_FlexCms

Conflicts:
	src/app/code/community/Firegento/FlexCms/etc/config.xml