added Custom Filters directory
updated halftone in master
fixed merges