merge work on makeing angular services work with new REST API and other improvements to the editors, in particular the notes editor