* far too late commit after Dortmund
Merge branch 'unstable' of https://github.com/fiezi/Moviesandbox into unstable

Conflicts:
	classes/videoTextureActor.cpp