Fixed image upload
Updated gem versions
updated file uploading and removed template
Merge branch 'master' into release