Merge branch 'master' of https://github.com/grappler/wordpress-flowplayer-beta

Conflicts:
	includes/shortcode.php
new shortcode changes