fixed layout
Merge branch 'master' of https://github.com/Esysteme/glial-new
test merge
Conflicts:
	application/view/Layout/header.view.php