OK button a bit wider
remove clear inventory button; make hotkey only
Merge pull request #896 from redv/interface10_new_research

Pixel perfection: ResearchInfoState
Merge pull request #899 from myk002/move_clear_inv_to_hotkey_only

remove clear inventory button; make hotkey only
Map: put my smoke routine into advanced drawTerrain() ...

Soldier: decrease psi-active chance from 6 to 5%

Merge branch 'master' of https://github.com/SupSuper/OpenXcom into oXc_kL
Conflicts:
	src/Basescape/ResearchInfoState.cpp
	src/Battlescape/InventoryState.cpp
	src/Battlescape/InventoryState.h