Fiddled with attack method
Merge origin/master
fixed MarketplaceScreenController imports.
Merge origin/master