account detail panel
attachment s3 upload change
Merge branch 'demo1' into demo2

Conflicts:
	db/seeds.rb