Merge branch 'master' into desarrollo
cambie el pattern para detectar url, fix typo
Merge branch 'desarrollo' of https://github.com/CGastrell/argenmap.jquery into desarrollo
Merge branch 'desarrollo'