Merge pull request #1 from SupSuper/master

Backporting
Merge remote-tracking branch 'upstream/master'

Backport.
fix soldiers with a jesus complex
add some missing data

and remove some redundant stuff
fix cancel button
why do math when a const int will do just as well

the math was off anyway.
Fix explosiveEfficacy logic error
Merge pull request #847 from DarkDefender/grenade_fix

Fix explosiveEfficacy logic error
Update files
Fixes:
- Base inventory crash
- HQX crashes
- Craft soldier numbers not updating
- New battle soldiers going over craft limit
- Geoscape sidebar
Merge pull request #2 from SupSuper/master

Backporting
Add missing Xcode build files

Turns out some files didn’t make it into the repo with the initial push
due to specific .gitignore restrictions.
Merge pull request #848 from luciderous/master

Add missing Xcode build files
Show 'Damage' text-header on ammo and grenades in Ufopaedia.
Merge pull request #849 from fenyo1/UfopediaAmmoDamage

Show 'Damage' text-header on ammo and grenades in Ufopaedia.
Workaround for russian letter "Ё"/"ё" (unicode U+0401/U+0451) garbling up TextEdit.

(We just substitute them with Latin U+00CB/U+00EB which look exactly the same but are actually present in the font)
Merge pull request #850 from sfalexrog/fixes

Workaround for russian letter "Ё"/"ё" (unicode U+0401/U+0451) garbling u...
Updated icons
Added mod to enable aliens picking up weapons.
Merge branch 'master' of https://github.com/SupSuper/OpenXcom