fix 828
Merge branch 'master' of https://github.com/SupSuper/OpenXcom into oXc_kL

Conflicts:
	src/Basescape/ManufactureInfoState.cpp
	src/Basescape/NewManufactureListState.cpp