Merge pull request #35 from yalmasri/master

y17 Modify Users with Catalogs
Merge pull request #36 from yalmasri/master

y17
locations

locations
bugs

bugs
modify user_info

modify user_info
Merge pull request #11 from galaviz/master

bugs and locations