Fixed update_wrapper import and fixed image location.

Images now come from media where they belong, and the update_wrapper
was broken.  The app should run fine under 1.6 now.
Merge branch 'release/1.4'