actualizada 26-08-14
Merge branch 'master' of https://github.com/alfredoHalloween/protectoM.git