Merge pull request #151 from amagdas/master

fix(image upload): fix image upload, minor clean-up.
Merge pull request #152 from amagdas/master

fix(metadata) Fix metadata storage for Amazon
Merge pull request #153 from amagdas/master

fix(archive) fix media retrieval, minor cleanup