Merge remote-tracking branch 'origin/design'

Conflicts:
	src/functions/inscriptionSession.php
	src/layouts/headerAdmin.php
Some update
commit