change of basic layout

Article, with images management (Plupload bundle and CKeditorbundle)

Signed-off-by: Thomas Leduc <tleduc2@hotmail.fr>
Merge branch 'master' of https://github.com/RemiDelhaye/ArrasFilmFestival

Signed-off-by: Thomas Leduc <tleduc2@hotmail.fr>

Conflicts:
	src/ArrasFilmFestival/BackOfficeBundle/Controller/VideoController.php
	src/ArrasFilmFestival/BackOfficeBundle/Entity/Photo.php
	src/ArrasFilmFestival/BackOfficeBundle/Entity/Podcast.php
	src/ArrasFilmFestival/BackOfficeBundle/Entity/Video.php
	src/ArrasFilmFestival/BackOfficeBundle/Resources/views/Photo/index.html.twig
	src/ArrasFilmFestival/BackOfficeBundle/Resources/views/Podcast/edit.html.twig
	src/ArrasFilmFestival/BackOfficeBundle/Resources/views/Podcast/index.html.twig
	src/ArrasFilmFestival/BackOfficeBundle/Resources/views/Video/index.html.twig
	web/uploads/photos/32f9ebe15fccaa450bd741bd738d3cf364eaebbe.png
	web/uploads/photos/87ca973d7be9d9e708ce643fd3fa31f7acbc3299.png
	web/uploads/photos/c1ed4ff2b40df6e562adeb8a78912a513a80484e.png
Last commit before reinit

All in the title

Signed-off-by: Thomas Leduc <tleduc2@hotmail.fr>