Netbeans Project Broken

After the latest restore, the Git repo was fixed, but the Netbeans
project was broken. Manually fixed build.xml file so that project builds
and runs.

Tweaks to ColorSwatch. Tweaks to ColorPicker.