Bughunting:

several small improvements
Merge remote-tracking branch 'origin/master'

Conflicts:
	PDX main/Controller/ImageController.py