Merge branch 'master' of https://github.com/SaFrMo/wizard

# By Sander
# Via Brook Andrews (2) and Sander (1)
* 'master' of https://github.com/SaFrMo/wizard:
  ProjectSettings?
Merge branch 'master' of https://github.com/SaFrMo/wizard