Inital jump to Gtk3
Merge branch 'gtk3'

Conflicts:
	Makefile
	tray.c