Fixed issues where staid and staname were being used instead of qw_id
and qw_name. This fixes both NAWQAAN-416 and NAWQAAN-417
Merge branch 'master' of github.com:USGS-CIDA/nar_ui into NAWQAAN-416
Merge pull request #342 from mbucknell/NAWQAAN-416

Nawqaan 416