Fix filtering when both types present

When using both DynamicPropertyFilter and HateoasBeanPropertyFilter,
if either one allows serialization, the object will be serialized.

In order to make them work together, I merged them.  DynamicpropertyFilter
is a supertype of HateoasBeanPropertyFilter.  It makes the setup much easier
as well.