Merge branch 'develop'
Merge branch 'master' of https://github.com/MadeiraCloud/salt
[hotfix/debian-npm]
fix debian npm package bug
[hotfix/debian-npm]
fix no tty bug in nodejs install script
[master]
Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop'
fix watch supervisord (hotfix master)
Merge branch 'develop'
Merge branch 'master' of https://github.com/MadeiraCloud/salt
Merge branch 'develop'
Merge branch 'develop'