merge tweaks for Flowplayer lib into napa fork
merge tweaks for Flowplayer lib into napa fork