Shader added
Merge branch 'master' of https://github.com/mogonen/shady-master

Conflicts:
	canvas.h
	glwidget.cpp
	mainwindow.cpp
	render.cpp
	uicalbacks_meshshape.cpp