Disenadores 2
Merge branch 'master' of https://github.com/raalveco/diseno.git

Conflicts:
	app/config/constantes.ini