Merge pull request #48 from graimundo/master

UX fix and FF hang fix
[MARKET-96] - Removed Marketplace menu entry for non admin users