Type buttons, fixtures upgraded
fixtures fixed
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/Group4/BaseBundle/Resources/views/Default/index.html.twig