entities description
little push problem...
Merge branch 'master' of https://github.com/MikaDo-/lightpanel

Conflicts:
	.gitignore
	src/MikaDo/LightPanelBundle/Resources/views/MinecraftServer/navbar.html.twig
	src/MikaDo/LightPanelBundle/Resources/views/MinecraftServer/overview.html.twig