Merge branch 'master' of git.njae.me.uk:cas-master-teacher-training