update of core (7.21) and contrib (token, libraries)
Merge development from branch: drupal7