Merge branch 'dev_preferences' into 'master'

src/main/java/edu/mit/blocks/codeblocks/InfixBlockShape.java

...ava/edu/mit/blocks/codeblocks/ProcedureOutputManager.java

src/main/java/edu/mit/blocks/codeblockutil/CQueryField.java

src/main/java/edu/mit/blocks/codeblockutil/GlassCard.java

src/main/java/edu/mit/blocks/codeblockutil/LabelWidget.java

...n/java/edu/mit/blocks/controller/WorkspaceController.java

src/main/java/edu/mit/blocks/renderable/BlockLabel.java

src/main/java/edu/mit/blocks/renderable/CommentLabel.java

src/main/java/edu/mit/blocks/renderable/NameLabel.java

...in/java/edu/mit/blocks/renderable/RBHighlightHandler.java

src/main/java/edu/mit/blocks/renderable/RenderableBlock.java

src/main/java/edu/mit/blocks/workspace/BlockCanvas.java

src/main/java/edu/mit/blocks/workspace/ContextMenu.java

src/main/java/edu/mit/blocks/workspace/FactoryCanvas.java

src/main/java/edu/mit/blocks/workspace/FactoryManager.java

src/main/java/edu/mit/blocks/workspace/SearchBar.java

src/main/java/edu/mit/blocks/workspace/Workspace.java