image updates
Merge branch 'develop' into css_fixes

* develop:
  image updates
merged stuff