Minor updates for compatibility with the new trainer#4

emsunshine wants to merge 7 commits into

mainOpen-Catalyst-Project/tutorial:mainfrom

new-trainer-updatesOpen-Catalyst-Project/tutorial:new-trainer-updatesCopy head branch name to clipboard