Merge branch 'master' of https://github.com/lukase/ola

Conflicts:
	common/io/Descriptor.cpp
Merge branch 'master' of https://github.com/lukase/ola