Test
Merge branch 'master' of github.com:Ener-Getick/v3

Conflicts:
	src/Dof/CharactersBundle/Resources/views/Spell/show.html.twig