- Corrected preprocessor usage
Fixed a missing rename
Merge branch 'windows_unittesting' of https://github.com/lukase/ola into windows_unittesting

Conflicts:
	common/io/Descriptor.cpp