s3 changes
Merge branch 's3'

Conflicts:
	app/controllers/users_controller.rb