WIP - squarebrowsing
Merge branch 'master-axel'

Conflicts:
	Resources/views/Player/main.html.twig
fix css display