Junk
Hook up marketplace. Problem: Marketplace window not showing
Updated the build script to be compatible with png and css
Merge remote-tracking branch 'origin/master' into TempBranch