Content
content
content
content
Merge branch 'content' of git://github.com/c2is/BigfootContentBundle into content

Conflicts:
	Controller/PageController.php
	Entity/Sidebar.php
	Form/Type/Sidebar/BlockType.php
	Resources/config/services.yml
	Resources/views/templates/block/title_desc_img/title_desc_img_1.html.twig
	Resources/views/templates/sidebar/title_desc_img_block/title_desc_img_block_1.html.twig
	Subscriber/MenuSubscriber.php