modify s3 credential
Merge branch 's3'

Conflicts:
	app/util/S3Uploader.scala
git update s3
git update tmp folder(for s3)
modify