filter view controller v2
Merge remote-tracking branch 'origin/master'
Fixing merge conflicts