added textTypes
added types
Merge branch 'master' of https://github.com/martial/cmsbundle

Conflicts:
	Controller/NodesController.php
	Entity/ContentType.php
	Entity/Node.php
	Form/NodeType.php
	Form/TextContentTypeType.php