Commenting.
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/gui/klotsid.py
Commenting.