tweaked flowplayer
merged branch