Goto Kobo -> GoKobo
Merge remote-tracking branch 'origin/master'

Conflicts:
	Kobo/views/profile.erb
merge