Updated drupal to version 7.21 and updated all modules
Files removed during the drupal update
Removed overlay dependencies
Merge branch 'master' into light-blue