Add missing modules
Merge branch 'master' into drupal-7.26
Add patch for select_or_other
Add usersearchtoadmin
Fix conflict