Merge pull request #40 from rpanjwani/market-hookup

Market hookup
Fixed seller location editing

When a user pressed the Edit Location button previously, we would
default to editing markets, which we decided should never be allowed.
This changes the behaviour so that we default to editing custom
locations.
Added title
Merge branch 'master' into market-hookup
Fixed masonry for markets.