Merge branch 'master' of github.com:gonzaparra/webankyrins

Conflicts:
	src/LFP/StructuralAnks/MainBundle/Resources/views/Home/show.html.twig