cleanup
Merge branch 'feature-pixelcontroller-console' of github.com:neophob/PixelController into feature-pixelcontroller-console