descartar

changes
cambios a descartar

cambios a descartar xq no insertaba
Merge remote-tracking branch 'origin/master'

Conflicts:
	configuracion/carrerasCrear.php
	includes/functions-carreras.php
	js/common-logic.js