Real parse request done
Merge branch 'master' into with_poll

Conflicts:
	src/server.cpp
No memory-copy
Merge branch 'master' into with_poll