Merged #64 "Editable user profile page"