Add a server target
Merge branch 'makefile' into develop