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 #109 from victorbetha/master

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

sdfghjm
Merge pull request #14 from museoXela/master

fasdfasd
Corrección de errores

Para un mejor funcionamiento
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 #10 from museoXela/master

funciones con null
Merge pull request #4 from museoXela/master

sdfghnj
Cambios
Merge pull request #113 from Migue4/master

Cambios Miguel
Merge pull request #112 from bryanangom/master

Merge pull request #10 from museoXela/master
Merge pull request #11 from museoXela/master

yjhj
Merge pull request #114 from kaliman2014/master

Merge pull request #5 from museoXela/master
prueba