Finished predicate logic using generic comparables and assertions.
Merge branch 'master' into robDev