Updating entity & ctools to dev

Signed-off-by: iaminawe <gregg@iaminawe.com>