.
Merge branch 'master' of https://github.com/danposch/itec-scenarios

Conflicts:
	extensions/player/layeredadaptationlogic.cc
	extensions/player/layeredadaptationlogic.h