Very nightly build.
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/Controller.py
	src/GreyBitmapProcessor.py
	src/ImageHandler.py
Very nightly build.