finished moving marketplace to new view
Merge origin/master