readme and base.html.twig
Merge remote-tracking branch 'upstream/master'

Conflicts:
	app/Resources/views/base.html.twig
delete mergeconflict backup
wip
Merge branch 'master' of github.com:InnovaLangues/self
delete .orig
Merge pull request #7 from arnaudbey/master

bordel
WIP bugged many2many relation
Translation french column name to english column name.
Merge resolution Arnaud/Eric.
Merge remote-tracking branch 'origin/anglais' into anglais

Conflicts:
	src/Innova/SelfBundle/Entity/Test.php
	src/Innova/SelfBundle/Entity/User.php