ajouts charte graphique avec le soleil + wireframes +interface graphique avec le soleil
a
Merge branch 'master' of https://github.com/wolfoux/soleil

Conflicts:
	app/cache/prod/appProdDebugProjectContainer.php
	app/cache/prod/appProdDebugProjectContainer.php.meta
	app/cache/prod/appProdDebugProjectContainer.xml
	app/cache/prod/appProdDebugProjectContainerCompiler.log
	app/cache/prod/jms_security/Doctrine-Bundle-DoctrineBundle-Controller-ProfilerController.cache.php
	app/cache/prod/jms_security/FOS-JsRoutingBundle-Controller-Controller.cache.php
	app/cache/prod/jms_security/FOS-UserBundle-Controller-ChangePasswordController.cache.php
	app/cache/prod/jms_security/FOS-UserBundle-Controller-GroupController.cache.php
	app/cache/prod/jms_security/FOS-UserBundle-Controller-ProfileController.cache.php
	app/cache/prod/jms_security/FOS-UserBundle-Controller-RegistrationController.cache.php
	app/cache/prod/jms_security/FOS-UserBundle-Controller-ResettingController.cache.php
	app/cache/prod/jms_security/FOS-UserBundle-Controller-SecurityController.cache.php
	app/cache/prod/jms_security/Symfony-Bundle-AsseticBundle-Controller-AsseticController.cache.php
	app/cache/prod/jms_security/Symfony-Bundle-FrameworkBundle-Controller-Controller.cache.php
	app/cache/prod/jms_security/Symfony-Bundle-FrameworkBundle-Controller-RedirectController.cache.php
	app/cache/prod/jms_security/Symfony-Bundle-FrameworkBundle-Controller-TemplateController.cache.php
	app/cache/prod/jms_security/Symfony-Bundle-TwigBundle-Controller-ExceptionController.cache.php
	app/cache/prod/jms_security/Symfony-Component-DependencyInjection-ContainerAware.cache.php
	app/cache/prod/jms_security/Symfony-Component-DependencyInjection-ContainerAwareInterface.cache.php
	app/cache/prod/jms_security/soleil-AgendaBundle-Controller-AgendaController.cache.php
	app/cache/prod/jms_security/soleil-AgendaBundle-Controller-EvenementAgendaController.cache.php
	app/cache/prod/jms_security/soleil-AgendaBundle-Controller-InscriptionController.cache.php
	app/cache/prod/jms_security/soleil-AgendaBundle-Controller-PayementController.cache.php
	app/cache/prod/jms_security/soleil-ArticleBundle-Controller-ArticleController.cache.php
	app/cache/prod/jms_security/soleil-ContactBundle-Controller-ContactController.cache.php
	app/cache/prod/jms_security/soleil-DonBundle-Controller-DonController.cache.php
	app/cache/prod/jms_security/soleil-FormationBundle-Controller-FormationController.cache.php
	app/cache/prod/jms_security/soleil-SiteBundle-Controller-AdminController.cache.php
	app/cache/prod/jms_security/soleil-SiteBundle-Controller-ConfigurationController.cache.php
	app/cache/prod/jms_security/soleil-SiteBundle-Controller-SiteController.cache.php
	app/cache/prod/jms_security/soleil-UserBundle-Controller-SecurityController.cache.php
	app/cache/prod/jms_security/soleil-ecommerceBundle-Controller-CommandeController.cache.php
	app/cache/prod/jms_security/soleil-ecommerceBundle-Controller-PayementController.cache.php
	app/cache/prod/jms_security/soleil-ecommerceBundle-Controller-RealisationController.cache.php
	app/cache/prod/twig/51/0d/467e907e98df7734379e2c47defeb9dcf1664eb9873ff56b7e624537480d.php