amazon
Merge branch 'desarrollo' into amazon
rm
mapa is done
update plugins
Merge branch 'desarrollo' of github.com:jampzo/develop_cicpc into desarrollo
add image
update version
update 08_05_2014
update 2 08_05_2014
Merge branch 'desarrollo' of github.com:jampzo/develop_cicpc into desarrollo
delete2