annotate
refactor edit/remove icons out of admin views
fix merge conflicts and get up to date remote canon master