Correct user module desc
[develop]
fix npm require bug
Merge branch 'develop' of github.com:MadeiraCloud/salt into develop
Merge branch 'develop'