add systray
Merge branch 'master' of https://github.com/FastMacro/FastMacro

Conflicts:
	mainwindow.cpp