Add each new simulation to the main workspace toolbar.
Merge branch 'master' of https://github.com/SCI-Utah/cnome

Conflicts:
	cyclist/src/edu/utah/sci/cyclist/core/controller/CyclistController.java
Merge branch 'master' of https://github.com/SCI-Utah/cnome
Merge branch 'master' of https://github.com/SCI-Utah/cnome
Save and restore Inventory view.
Merge branch 'master' of https://github.com/SCI-Utah/cnome
Merge branch 'master' of github.com:SCI-Utah/cnome