merge users and samba together
remove remaining references to zentyal-samba
rename users to samba
Merge pull request #1358 from Zentyal/jacalvo/merge-samba-users

Jacalvo/merge samba users