added filters to features. There's a conflict with that, but I'll see how it goes
Merge branch 'drupal-update-7.22'