update entity module
update drupal core to 7.26
Merge branch 'updates'