Improved handlig of alien melee and psi weapons
Multiple special weapons
Merge pull request #969 from Yankes/AlienWeapon

Improved handlig of alien melee and psi weapons
layout
WoT

Merge branch 'master' of https://github.com/SupSuper/OpenXcom into oXc_kL
Conflicts:
	src/Battlescape/AlienBAIState.cpp
	src/Battlescape/BattlescapeGame.cpp
	src/Battlescape/BattlescapeGenerator.cpp
	src/Battlescape/BattlescapeState.cpp
	src/Battlescape/TileEngine.cpp
	src/Battlescape/UnitWalkBState.cpp
	src/Ruleset/Armor.cpp
	src/Ruleset/Armor.h
	src/Savegame/BattleUnit.cpp
	src/Savegame/BattleUnit.h
	src/Savegame/SavedBattleGame.cpp
	src/Savegame/SavedBattleGame.h