Construction 4 Merge 2

Please remove swt.jar from your build path.