add .. en master-prod
Merge branch 'master_dev' into master_prod

Conflicts:
	js/default.js
solucion de conflicto de github
add comentario desde github
Merge branch 'master_qa' of https://github.com/mysterio56/AR into master_qa
Merge branch 'master_dev' of https://github.com/mysterio56/AR into master_dev
solucion de conflicto qa merge dev