Functions now return. Minor tab bug fixed
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/gui/blocks.py
Merge remote-tracking branch 'origin/master'