style tweaks
Merge branch '5.7.0-wip' of github.com:concrete5/concrete5 into 5.7.0-wip