Merge commit 'df21fa9760644584f132586bcdd108b53a3c2a33'

Conflicts:
	src/windoweventdemo/WindowEventDemo.java