Merge email

This is a pull request to update from the old jquery UI dialog pop outs to bootstraps modal  pop outs