Merge pull request #284 from hintjens/master

Whitespace fixes
Include zproxy in README
Merge pull request #286 from claws/zproxy-readme-update

Include zproxy in README
zproxy api adjustments (zproxy_bind now spawns attached thread and starts proxy) + test improvements
fixing merge conflict in zproxy.c
Merge pull request #287 from Talksum/master

zproxy api adjustments + test improvements
Added UUID support class