add filter support to custom post type
Merge branch '1.2.0' of https://github.com/flowplayer/wordpress-flowplayer into 1.2.0