Merge origin/master

Conflicts:
	backend/app/views/cotizador/index.php