adding images and such into the right directory. At least the right directory so they show up. Who knows why Ushahidi now things they're in media/uploads/dia/img and not media/img where they should be.
Merge branch 'master' of github.com:jetherton/wtm