server is now command prompt controlled
Merge branch 'develop'