Image uploads now only allows .gif, .jpeg, .jpg, and .png extensions

Images are now stored with uuid generated file names.
fixed merge conflicts