Initial changes for adding monitor
api_mods merge
First version of kill and monitor
test for kill and monitor
removed useless log msgs
Merge branch 'api_mods' into failure
Merge branch 'master' into failure
Parameter N in include
Conflicts merge supervisor
Moved constant N to the include file
Adding monitor test
Fix conflicts
Finish test