Don't refresh models/associations if they haven't finished loading
set current marketplace during model hook to prevent auth errors
Fix model bugs on activity pages
Don't throw away marketplace lites when logging in
Stop making a network request to get the marketplace secret
Simplify nesting
Rename MarketplaceLite to UserMarketplace
Make user marketplace lookup cleaner
Fix adding/removing marketplaces
formatting
Merge commit '2648a4472e27ee4bba001f35a1a29b934b28bbd5'
Merge remote-tracking branch 'origin/master'