3 pages poll :
	-responsive
	-bootstrap
Phase 1 pour UserBundle

Ajout du FOSUser bundle + HWIOAuthbundle
Fos implenté ainsi que HWIO il reste à changer les vue et route pour que le log fonctionne proprement
Mise a jour composer nécessaire pour installer les bundle correctement
Commit de la mort
Fin des modifs sur le .gitignore de la mort
Commit de la résurrection...
Bootstrap V2:
problem ergo
pages poll
page home
Merge remote-tracking branch 'origin/symfony' into symfony

Conflicts:
	app/cache/dev/appDevDebugProjectContainer.php
	app/cache/dev/appDevDebugProjectContainer.php.meta
	app/cache/dev/appDevDebugProjectContainer.xml
	app/logs/dev.log
modal connexion
probleme page home réglé
Debut de Tchernobil

Phase  : création du réacteur
Ajout des namespaces dans les Mappings Doctrine
Quelques tests radioactifs
Construction du sarcophage autour du réacteur 4
Finalisation du sarcophage
Il y avait un trou dans le sarcophage
Intégration du HWI bundle pour les connexion avec les APIs

Google/Facebook/ reste linkedIn
Merge remote-tracking branch 'origin/symfony' into Tchernobyl

Conflicts:
	app/cache/dev/appDevDebugProjectContainer.php
	app/cache/dev/appDevDebugProjectContainer.xml
	app/logs/dev.log
	src/Bdls/ProjetBundle/Entity/Date_Choice.php
	src/Bdls/ProjetBundle/Entity/Date_Poll.php
	src/Bdls/ProjetBundle/Entity/Date_Vote.php
	src/Bdls/ProjetBundle/Entity/Place_Choice.php
	src/Bdls/ProjetBundle/Entity/Place_Poll.php
	src/Bdls/ProjetBundle/Entity/Place_Vote.php
	src/Bdls/ProjetBundle/Entity/Text_Choice.php
	src/Bdls/ProjetBundle/Entity/Text_Poll.php
	src/Bdls/ProjetBundle/Entity/Text_Vote.php
	src/Bdls/ProjetBundle/Entity/Vote.php
Fin de l'hiver nucléaire
Merge remote-tracking branch 'origin/boot' into Tchernobyl

Conflicts:
	app/AppKernel.php
	app/cache/dev/annotations/137636d9a151ece443ec1a0bc45bacf9998ded1a#__clone.cache.php
	app/cache/dev/annotations/137636d9a151ece443ec1a0bc45bacf9998ded1a#__construct.cache.php
	app/cache/dev/annotations/137636d9a151ece443ec1a0bc45bacf9998ded1a#add.cache.php
	app/cache/dev/annotations/137636d9a151ece443ec1a0bc45bacf9998ded1a#addError.cache.php
	app/cache/dev/appDevDebugProjectContainer.php
	app/cache/dev/appDevDebugProjectContainer.php.meta
	app/cache/dev/appDevDebugProjectContainer.xml
	app/cache/dev/appDevDebugProjectContainerCompiler.log
	app/cache/dev/appDevUrlGenerator.php
	app/cache/dev/appDevUrlGenerator.php.meta
	app/cache/dev/appDevUrlMatcher.php
	app/cache/dev/appDevUrlMatcher.php.meta
	app/cache/dev/classes.map
	app/cache/dev/classes.php
	app/cache/dev/classes.php.meta
	app/cache/dev/profiler/index.csv
	app/cache/dev/twig/14/21/7d2f311058d45ed4e4352a5765edb86dc2ba3cb1072c88fb32392baa156f.php
	app/cache/dev/twig/38/98/429a88ee4da28d9f5f2a1276b48d5545f770f6c8733a35d53a7f7265c500.php
	app/cache/dev/twig/42/f6/077cff74f57989226ef714109ecc14ee097335bb0cb936210b45357fe2a1.php
	app/cache/dev/twig/57/14/46dfbde4f3667f9fea85ee678728cb630b2283ad5c7a6cb515e678bd5e1e.php
	app/cache/dev/twig/76/d3/fad052cfecc2f1d08676677d54a6c311be40b343cf8cf2e09c2c7c06ecbb.php
	app/cache/dev/twig/7f/2c/a19df52a8a785f8071dbb6b7f739a23d9a5130e1035f26e1c0e0cfd4cb15.php
	app/cache/dev/twig/7f/33/c3bf64ed726019a046134bc121516218fc9a4bc7a2fa12705699ed90f412.php
	app/cache/dev/twig/ad/31/d17259b057323e7ca95e86cf95227011ed9bd5435cb2595504a2f71c8c99.php
	app/cache/dev/twig/d5/9f/fc49410e021f135bf2026f0436a072eb2437b46da1782cee263124f803a3.php
	app/cache/dev/twig/ee/32/2d7333385a2eae93b90768fa7a0dce6dbc808d28056ee410eb71adc685a8.php
	app/cache/prod/appProdProjectContainer.php
	app/cache/prod/appProdUrlMatcher.php
	app/cache/prod/classes.map
	app/config/config.yml
	app/config/parameters.yml
	app/config/routing.yml
	app/config/security.yml
	app/logs/dev.log
	app/logs/prod.log
	nbproject/private/private.xml
	src/Bdls/ProjetBundle/Controller/IndexController.php
	src/Bdls/ProjetBundle/Controller/PollController.php
	src/Bdls/ProjetBundle/Controller/SecurityController.php
	src/Bdls/ProjetBundle/Resources/config/routing.yml
	src/Bdls/ProjetBundle/Resources/views/Default/dashboard.html.twig
	src/Bdls/ProjetBundle/Resources/views/Default/home.html.twig
	src/Bdls/ProjetBundle/Resources/views/Default/layout.html.twig
	src/Bdls/ProjetBundle/Resources/views/Default/pollConnection.html.twig
	src/Bdls/ProjetBundle/Resources/views/Default/pollCreation.date.html.twig
	src/Bdls/ProjetBundle/Resources/views/Default/pollCreation.def.html.twig
	src/Bdls/ProjetBundle/Resources/views/Default/pollCreation.lieu.html.twig
	src/Bdls/ProjetBundle/Resources/views/Default/pollShare.html.twig
	src/Bdls/UserBundle/Resources/config/routing.yml
	web/bundles/projet/css/orangeSoberKit.css
	web/bundles/projet/css/style.css
	web/bundles/projet/js/sondage_date.js
	web/bundles/projet/js/sondage_map.js
Anihilation du cache... pour la énième fois.
LE REACTEUR ENTRE EN FUSIOOOON

Conflicts:
	app/cache/dev/appDevDebugProjectContainer.php
	app/cache/dev/appDevDebugProjectContainer.php.meta
	app/cache/dev/appDevDebugProjectContainer.xml
	app/cache/dev/appDevUrlGenerator.php.meta
	app/cache/dev/appDevUrlMatcher.php.meta
	app/logs/dev.log