Single/double quote consistency
Fixed relationship ambiguity
Merge branch 'master' into courses
Working on associating courses with scouts