stuff
Merge branch 'dev' of https://github.com/flowplayer/flowplayer into dev
Merge branch 'dev' of https://github.com/flowplayer/flowplayer into dev