Uploading images works from mynode/stream/image
More stuff for displaying images
Fixed merge conflicts