--- * Added a separate component to grid field to hold buttons. * Updated templates for changes * Updated comments Conflicts: css/AssetUploadField.css css/GridField.css