Merge pull request #10 from galaviz/master

L4 - push all changes
y17 Modify Users with Catalogs
Merge pull request #35 from yalmasri/master

y17 Modify Users with Catalogs