CC-5102:
Cross Fading: No cross fading effect

-fixed start/end calculations
Merge branch 'master' of dev.sourcefabric.org:airtime