Merge origin/master

Conflicts:
	application/controllers/alumno.php
Merge origin/master

Conflicts:
	application/controllers/alumno.php
Merge origin/master
Merge origin/master

Conflicts:
	application/controllers/alumno.php
Merge origin/master

Conflicts:
	application/controllers/alumno.php
Merge origin/master
Merge origin/master

Conflicts:
	application/controllers/alumno.php
Merge origin/master
Merge origin/master

Conflicts:
	application/controllers/alumno.php
Merge origin/master

Conflicts:
	application/controllers/alumno.php