commit enne cougari logging pulli
Merge branch 'logging' of https://github.com/Cougar/uniscada into develop

Conflicts:
	udpcomm.py
Merge remote-tracking branch 'neeme/develop' into cleanup

Conflicts:
	udpcomm.py