editable name in rail
Merge branch 'editname' into testing