Merge pull request #11 from pedroigor/master

More refactoring.
merging
merged role managment with local, assign role user to users
Removing unnecessary code.