Merge branch 'net-monitor' of /home/git/repositories/proinfodata/unstable

client/.gitignore

windows-collect/.gitignore

windows-collect/Makefile

windows-collect/src/collect.py

windows-collect/src/netmon/compileNetmon.py

windows-collect/src/netmon/netmon.py

windows-collect/src/proinfodataAgent.py

windows-installer/.gitignore

windows-installer/build-windows-installer.sh

windows-installer/src/installer.nsi