Streaming video from multiple sources (eventually).
Needs 'videoid' and 'service' options, e.g.:
"videoid":"522594", "service":"ustream"

Only ustream.tv supported for now, others will follow.
Initial AlJazeera stream. Probably won't keep working.
Just pass service=aljazeera. No videoid required (put at 0 or so)
New streaming method, streaming rtmp directly with flowplayer. A new
config option was introduced (stream) which should point to the rtmp
resource. The videoid option is used to select the video to be played
from the rtmp server. Instead of looking for rtmp streams on the net,
just use the ones from the XBMC plugin:
https://github.com/k3oni/plugin.video.world.news.live/blob/master/channels.py
Database and escaping semi colons... for now, just enter stream without
rtmp:// and attach in view.
Cleanup
Merge branch 'master' into development
minor legend change
changed title
now => next up in top left corner
css fixes for signage
conflict fix
conflict fix
ugh