Allow blocks with different connects to be added to toolbox categories
Code review feedback
Fix typo
Merge branch 'toolbox-categories' into staging

Conflicts:
	blockly/src/base.js
	dashboard/app/models/studio.rb