allow filtering of post types that the Civi button appears on
Merge remote-tracking branch 'upstream/4.4' into 4.4-master-2014-06-01-20-53-38
Merge remote-tracking branch 'remotes/upstream/master'
Merge branch 'master' into choose-post-types