fixed content-type handing
Merge branch 'master' of github.com:zerovm/zerocloud