calendar view: made popup window for editing calendar entries.
added cancel button (non-functional)
calendar edit forms, made cancel button work.
Merge branch 'feature/jr_calendar_unlock_btn_shows_edit_and_new_btns' into dev