fix ONMainWindow layout in broker mode
Update man page: Add broker relevant cmdline options.
Continue development...

Conflicts (resolved by Mike Gabriel):
	VERSION
	debian/changelog
	version.h
	x2goplugin.rc
Add scripts and additional files for building X2Go Client disk images for Mac OS X. (Fixes: #131).
work in changelog entry of release 4.0.0.4
added another Qt Creator project file type