prova commit al branch
Merge pull request #40 from oadan79/master

sync
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'
Better user expirience. Show no php error whre the are no students in a group
Users in group shows selected grup students.
Merge branch 'master' of https://github.com/acacha/ebre-escool

Conflicts:
	application/views/include/ebre_escool_body_header.php
prova a veure que