Translaion maintenance.
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Further translation.
Merge remote-tracking branch 'upstream/master'

Conflicts:
	bin/data/Language/Ukrainian.lng
Merge remote-tracking branch 'upstream/master'
Replace Mac app icon

Get a better quality .icns icon for anyone out there
Add Xcode project files to the tree

A customized Xcode project bundle for anyone who wants to build their
own OpenXcom.app on OSX.
Merge pull request #841 from luciderous/master

Xcode project and new app icon added
Clean up Ufopaedia.
Updating documentation
Nope
do the thing
fix geoscape borders
break translations
Fixed makefile
fix typo
fix comrades dying in your arms crashing the game
fix 648

set turning units back to a standing state if they spot an enemy in their
pre-movement turn
Merge remote-tracking branch 'upstream/master'