Merged in our admin_edit_charity branch with passing cukes and specs

Here it is for your convenience.