Started controller for Marketplace view
Merge origin/master
Updated Controller for marketplace view