fixing implementation of Include even more, and removing PropertyGroup

Now, any HasProps instance can be Included() and they can also be subclassed