Components can now be specified as filterable
Merge remote-tracking branch 'origin/master'
Changed project settings in merge