back in a bit
Fixed tests added api run
Merge branch 'feature/cliforweb' into develop
Ping
Added debug swith to apiserver