Merge branch 'develop'
Bump version; add EOF break to client; update readme
makefile clones git submodules
server version correction
makefile cleanup
Merge branch 'master' into develop