refactor workspace to subclass container
Merge branch 'master' into devoncarew_workspace_implements
merge to master; fix location == null bug
Merge pull request #1133 from devoncarew/devoncarew_workspace_implements

refactor workspace to subclass container