Messed around with upgrade view, added images, drawable objects, etc
Merge branch 'Upgrades'
Fixed upgardeactivity after merge