Merge pull request #299 from bkng/develop

PLFM-1702: Rename Competition to Evaluation
pull 299 code review changes