Merge pull request #315 from steveblock/demos

Fix some demos
Remove bad change to test_without_at
Merge pull request #317 from alancutter/fixTestAtBungle

Remove bad change to test_without_at
Fix MediaReference after switch to new Timing interface

This was broken by 5ee65b94527a1c0808d89f2ba229d88303310332 and following commits.

Also fix the test after the switch to the new testing framework.
Fix MediaReference to stop the media when detached from its Player