ticket:15 profile edit name
Merge branch 't15_profile_edit_name'