merge tweaks for Flowplayer lib into napa fork
Merge branch 'dev' of https://github.com/drphelps/flowplayer into dev