#57 #58 controles de movimiento ver2
Merge branch 'devel-A' of https://github.com/eloipuertas/ES2013Dijous into devel-A