fixed rebase issues
fixed merge conflicts
pictures work with ImageMagick
uploading pictures working