Adds EntityFunctions and more EntityPredicates
Merge pull request #1384 from aledsage/feature/EntityFunctions

Adds EntityFunctions and more EntityPredicates