session
Merge branch 'master' of github.com:wario4/gics

Conflicts:
	src/gics/SessionBundle/Resources/views/Session/info.html.twig