Merge branch 'working-copy'

Temporarily redirected “My Calendar” menu item to calendar/index.
Added a note to clean up the _get_events_json() function.