Resolved #108 - allow restarting a specific server daemon.
Merge branch 'master' into dev
Code style fixes.
Merge branch 'dev' into manual-tests