fixed some bugs
Merge remote-tracking branch 'origin/master'

Conflicts:
	htm_sub/region.py