Upload profile picture
Merge remote-tracking branch 'origin/master'

Conflicts:
	Gemfile
Merge remote-tracking branch 'origin/master'

Conflicts:
	Gemfile