Makefile bijgewerkt na merge van nanokontrol-branch
Fix compilation
Merge branch 'master' into midi
Final split of input and dmxd
Merge remote-tracking branch 'origin/midi' into midi

Conflicts:
	src/input.c