Trocar a ordem de funding-source e award-id

Fixes #900
Merge pull request #932 from robertatakenaka/tk_900

Trocar a ordem de funding-source e award-id