Merge remote-tracking branch 'origin/master' into hcastillo/PutosTodos
Merge pull request #36 from museoXela/master

werdftgh
Merge pull request #9 from museoXela/master

funciones4
Merge pull request #106 from Migue4/master

Corrección de clases
Merge pull request #108 from Migue4/master

Corrección de Clases 2
Modificar url de conector
Merge pull request #109 from victorbetha/master

Merge pull request #36 from museoXela/master
Merge pull request #14 from museoXela/master

fasdfasd
Merge remote-tracking branch 'origin/master' into hcastillo/PutosTodos
Merge pull request #110 from Migue4/master

Corrección de errores
Cambios 26/10/13

añadido if en todas las funciones en caso la lista esta nula retronar
null, cambiado direccion a "/api/..."
Merge pull request #107 from bryanangom/master

Merge pull request #9 from museoXela/master
Merge pull request #111 from hC4stillo/hcastillo/PutosTodos

Hcastillo/putos todos
Merge pull request #4 from museoXela/master

sdfghnj