Re-added push buttons and slider
Merge branch 'origin/master'

Conflicts:
	Makefile
	mainwindow