Merge branch 'calidad' of github.com:jsiles/manufactura into calidad

Conflicts:
	common.php
Merge commit

Sync Server pruebas locales
Merge branch 'calidad' of github.com:jsiles/manufactura into calidad