Added the "not" block
Merge remote-tracking branch 'origin/master'

Conflicts:
	js/activity.js
	js/basicblocks.js