Merge pull request #282 from hintjens/master

Code cleanups
initial check in of new zproxy feature
fixing merge conflict between auto generated files concerning zmonitor and zproxy additions
adding initial generated documentation for the zproxy class
Merge pull request #283 from Talksum/master

initial check in of new zproxy feature
Whitespace fixes