Merge branch 'master' into glyph-coloring-actions
Merge branch 'master' into glyph-coloring-actions
Merge branch 'master' into glyph-coloring-actions
Detect nested changes
Hotfix: Fix typo in ColoringSelectionProperty
getDisplayState()
save and load action state
fix actionhelper edit
Working coloring actions, BUG: bug with refresh

Bug: Execute action where coloring scheme is the same as the
originalValue’s coloringScheme. Refresh will not revert the values
correctly.
Properly reset workspace
Merge conflict

Had to resolve manually separate from the merge since the diff was awful
Revert a8e50d0..5250689

This rolls back to commit a8e50d02ac964a7eede2dd4d232ca5a791734875.
Fix completely botched merge
Tabs -> Spaces, continue merge to index.html
conflicts