image upload
merged master with paperclip branch, conflict fixed