pull in changes
fixed broken stuff, added non-retina graphics