- Some work on Art-Net infrastructure
Merge branch 'master' of https://github.com/lukase/beamerdmx

Conflicts:
	src/main.cpp