minor copy tweaks
merged conflict
Merge branch 'master' of github.com:jamietotten/CFSunalta
silverstripe
silverstripe , merge conflict