Avance 20 abril 2014
Merge branch 'master' of https://github.com/diegojardon/conectrabajo