Début de relocalisation des taches dans les US
Merge branch 'master' of https://github.com/MrBleuGlacial/CDP---Scrumosaurus
Mise en place complete des taches dans les US avec dépendances, et nouveau modèle de taches (migrate nécessaire)
Merge branch 'master' of https://github.com/MrBleuGlacial/CDP---Scrumosaurus

Conflicts:
	app/controllers/TaskController.php
	app/views/userstory/show.blade.php
Merge branch 'master' of https://github.com/MrBleuGlacial/CDP---Scrumosaurus

Conflicts:
	app/controllers/TaskController.php
	app/views/userstory/show.blade.php
Merge branch 'master' of https://github.com/MrBleuGlacial/CDP---Scrumosaurus

Conflicts:
	app/controllers/TaskController.php
	app/views/userstory/show.blade.php
Merge branch 'master' of https://github.com/MrBleuGlacial/CDP---Scrumosaurus

Conflicts:
	app/controllers/TaskController.php
	app/views/userstory/show.blade.php

Conflicts:
	app/controllers/TaskController.php
	app/views/userstory/show.blade.php