Merge branch 'session_editor'

* session_editor:
  First pass at search in session editor