removing references to non-working DisabilityOptions
Merge branch 'master' into new_disability

Conflicts:
	WeaveUI/src/weave/ui/DisabilityOptions.mxml
	WeaveUI/src/weave/application/VisApplication.as
	WeaveUISpark/src/weave/WeaveProperties.as