API: fixed shock error return message
API: update shock functions and notebook resource due to change in top level node fields
API: added sort support to m5nr
matrix api: added option to use hierarchal level with filter list, added more cv checking and error messages, matrix now returns list of all input ids even if no results found for some (throws error on empty matrix)
API: fixed conflicts
Merge pull request #364 from teharrison/develop

API updates: support chnages in shock, add sort for m5nr, fixed issuses with matrix