Merge remote-tracking branch 'upstream/master'
suppression d'un champ en trop
Merge pull request #4 from ALouis38/bugfixmecss

correction du fixeme
correct row and span imbrication
Merge pull request #5 from leovidal73/trois_volet

Merci
Innova/ActivityBundle generation
Migrating things to Symfony
Adding partial voletgauche
Modifications on the partial voletgauche.html.twig
add Step Fixtures. Use via innova:fixtures:tree
Test push (travis)
Test push (travis)
Add .travis.yml
Merge branch 'master' of github.com:purplefish32/ENPA
Update travis file for sf2
Merge remote-tracking branch 'upstream/master'
add --append parameter to fixtures
Merge pull request #6 from arnaudbey/master

add Step Fixtures.
Adding images in voletgauche.html.twig
Adding partial "voletdroite.html.twig"