fix soldiers with a jesus complex
add some missing data

and remove some redundant stuff
fix cancel button
Merge remote-tracking branch 'upstream/master' into experimental

Conflicts:
	src/Menu/OptionsBaseState.cpp