move mime type check
Merge branch 'refs/heads/s3'

Conflicts:
	app/server.js