Final changes to object selection menu.

Signed-off-by: nppangband <nppangbanddev@verizon.net>
Merge branch 'diego' of https://github.com/nppangband/NPPAngband_QT.git into Jeff
Merge branch 'master' of https://github.com/nppangband/NPPAngband_QT into diego

Conflicts:
	NPPQT/src/object_select.cpp