Improve shortcode
Merge branch 'develop' of https://github.com/flowplayer/wordpress-flowplayer into develop