Commiting organization in glcanvas
More from last commit
Merge remote-tracking branch 'origin/master'

Conflicts:
	player/player_qt5.pro.user