Added incident and incidence_type tables and grocery crud maintenance
Second version of incident and incident_type table managment
Merge remote-tracking branch 'upstream/master'

Conflicts:
	application/modules/attendance/controllers/attendance.php