Merge pull request #1 from SupSuper/master

Backporting
Merge remote-tracking branch 'upstream/master'

Backport.
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