Obtaining teachers from Mysql in the general_sheet report.
Merge branch 'master' of https://github.com/acacha/ebre-escool
Traballant amb el formulari Wizzard
Merge pull request #39 from oadan79/master

A vore si recordo com anava (modificacions del wizard)
Wizard guarda les dades a la base de dades
Fitxer apache/ebre-escool.conf
Merge branch 'master' of https://github.com/acacha/ebre-escool
General Sheet obtanied dinamically (MySQL)
Renamed view file to assure it was not working
Generated Teachers sheet pdf
Merge branch 'master' of https://github.com/oadan79/ebre-escool
Teacher reports. Modified class_list_report to use mysql and not ldap
Merge pull request #40 from oadan79/master

sync
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.
Added incident and incidence_type tables and grocery crud maintenance
Second version of incident and incident_type table managment
Merge branch 'master' of https://github.com/acacha/ebre-escool

Conflicts:
	application/views/include/ebre_escool_body_header.php