Fixing errores
Merge branch 'master' of github.com:TP-GDD-1C2014/TPGDD