Merge pull request #1 from mckaygerhard/master

sync with piccoro repo, now aplication compiles and run
Merge pull request #7 from vegnuli/master

Actualizaciones pull desde repo desarrollo, release interfaz y administrativo