fighting with git command
Merge https://github.com/GrupoEasyJS/Chameleon-WM

grrrrr, git is annoying.