#516: MIME type presetting added to amazon service.
Merge branch 'dev' of ssh://github.com/devbridge/BetterCMS into dev