Merge branch 'dev' of github.com:cismet/cismap-plugin into dev
added cismet-dev-exec and jalopy.skip to the run section of the nbactions
resolved merge conflict by accepting remote part (including Xdebug parameters)