Adding basic daemon support to server
Merge branch 'develop'