Merge pull request #1 from SupSuper/master

Backporting
Merge remote-tracking branch 'upstream/master'

Backport.
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
share inventory tile on 2-part mission interlude
i GUESS this won't hurt... much
Revert "Workaround for russian letter "Ё"/"ё" (unicode U+0401/U+0451) garbling up TextEdit."

This reverts commit 721b97df1ffc3a3e35ed241762a390a7ba0ff8d1 in favor of a better solution by hythlodaeus
Add russian letters Ё and ё (U+0401, U+0451) to the font set (thanks hythlodaeus!)

This is a better way to handle these letters. This should also allow these letters to be present in the translations, if they're ever needed.
remove unused strings
Merge pull request #852 from sfalexrog/fixes

Fixes
fix UI volume slider
Fixed: DragScrolling the Globe and using the MouseWheel to Zoom in/out at the same time caused flickering.