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