modulos

modulos bien, espero
Merge remote-tracking branch 'origin/master'

Conflicts:
	cc/assets/templates/views/modalidadesparciales.js