Updated drupal core and modules

Updated drupal core and added untracked files
Added edge mode to htaccess again