added 'user' option to grid submission script config
fixed merging confilicts