Modificacion de Attendance
Merge origin/master PEPE

Conflicts:
	src/ABC/AttendanceBundle/Controller/AttendanceController.php