lalala
varias cosas arregladas... BUAAAAA
Merge branch 'development' of https://github.com/sbianchi/wira into development