Try to make Makefile work
Merge branch 'master' of github.com:kingheaven/mate-applets

Conflicts:
	timer-applet/data/glades/add-edit-preset-dialog.glade