no se que esta modificado
Merge branch 'dev' of https://github.com/degva/GKD-client-side into dev