TrayWindow
Merge branch 'master' of https://github.com/bakwc/Pastexen

Conflicts:
	client/application.h