Bug fix
Merge branch 'click_to_edit' into admin