Fix user bug
Fix group bug
Merge branch 'develop' of github.com:MadeiraCloud/salt into develop