Merging from develop. Fine tuning for issue #192.

Conflicts:
	src/lisong_mechlab/view/mechlab/LoadoutInfoPanel.java