Committing old changes.
Merge branch 'html' of ssh://git@github.com/sproctor/warlock2.git into
html

Conflicts:
	core/cc.warlock.rcp/src/cc/warlock/rcp/ui/WarlockText.java