annotate
refactor edit/remove icons out of admin views
fix merge conflicts and get up to date remote canon master
minor changes to the view and remove sign up link
add error message for events if attempting to save date in the past
fix medium viewport views