minor workspace changes (switched to desktop)
re-write of main model classes, not yet integrated into system
Merge branch 'master' of https://github.com/social-software/bureaucrat