Added image uploading
Merged in feed changes