datetime
Merge remote-tracking branch 'origin/master'

Conflicts:
	js/funciones.js
	pags/mantenimiento_alumnos.php
Merge branch 'master' of https://github.com/xblacklotus/PTC

Conflicts:
	css/calendario.css
	css/kickstart-forms.css
	js/funciones.js
resolviendo conflictos
lkjloj
Merge branch 'master' of https://github.com/xblacklotus/PTC

Conflicts:
	css/kickstart-forms.css
	js/funciones.js
	pags/mantenimiento_alumnos.php
	pags/mantenimiento_usuarios.php