Dedent popup confirmation code
Fix Gemfile
Fix Gemfile
Add explicit arel gem

Conflicts:
	Gemfile
Update lock file
Fix a typo
Merge branch 'following-users'