Fixed previous conflict.
Added PipelineListener so you can listen for pipeline messages.
Merge branch 'master' of https://github.com/simeks/m7017e-lab

Conflicts:
	src/pipeline.cpp
	src/player.cpp
	src/player.h
Changed from 100ms to 1000ms for the refresh ui interval.