cambios
Merge remote-tracking branch 'origin/master'

Conflicts:
	cc/assets/js/app.js
	cc/assets/templates/views/materias.html