Best grade/max grade, webservices (tokens, binary files), minor fixing

Merged Astor Bizard requested to merge dev into test

Merge request reports