Merge branch 'diego' into Jeff
Merge branch 'Jeff'
wizard mode progress
Merge branch 'Jeff' of https://github.com/nppangband/NPPAngband_QT into diego