Removed unnecessary classes from blocks.py.
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/gui/blocks.py