AWS - S3 in place
removed photos
Merge branch 'aws-s3'

Conflicts:
	views/other_profile.erb