Merge origin/master

Conflicts:
	Sistema/public_html/session/principal.html
Merge origin/master
Algunos cambios
Merge origin/master

Conflicts:
	Sistema/public_html/index.html
	Sistema/public_html/session/Pagos.html
	Sistema/public_html/session/cancelacionCitaEsp.html
	Sistema/public_html/session/confirmacionCitaEsp.html
	Sistema/public_html/session/creacionOrientador.html
	Sistema/public_html/session/principal.html
	Sistema/public_html/session/registrarCursos.html