Added filter class and apply_filter prototype
Merge branch 'my_branch' into devel
solve conflicts devel and my_branch