prova commit al branch
left-Sidebar update, on collapse body moves to right
Merge branch 'master' of https://github.com/cristianestarlich/ebre-escool into cristianestarlich-master

Conflicts:
	application/views/include/ebre_escool_body_header.php
Merge branch 'cristianestarlich-master'