by rlmumford: CK Task improvements.
by rlmumford: Added entity template module.