match ammo types when applying inventory templates
add clear inventory button
enable templ hotkeys even when buttons are hidden
ensure hover info is correct when inv items change
fix too few items made with pre-TFTD mfg rules
fix calculation for manufacturing days left
Only do HQX if it is enabled
Merge pull request #887 from myk002/remember_ammo_in_template

match ammo types when applying inventory templates
Merge pull request #888 from myk002/clear_inventory_button

Add clear inventory button
Merge pull request #889 from myk002/fix_too_few_items_produced

Fix too few items manufactured and days left calculation
Merge pull request #891 from ajschult/hqx

Only do HQX if it is enabled
Fix compiler error
Inventory template adjustments +

Manufacturing hours left adjustments +
tu adjustments @ start of Battle (encumbrance)
proxyGrenades behind doors adjustments

Merge branch 'master' of https://github.com/SupSuper/OpenXcom into oXc_kL
Conflicts:
	bin/data/Language/en-GB.yml
	bin/data/Language/en-US.yml
	src/Basescape/ManufactureState.cpp
	src/Battlescape/InventoryState.cpp
	src/Battlescape/InventoryState.h
	src/Engine/Zoom.cpp
	src/Savegame/Production.cpp
update config files + language & ruleset