Improved handlig of alien melee and psi weapons
Multiple special weapons
Multiple special weapons
Whitespace and readme fix
Small improvements for future
Merge pull request #969 from Yankes/AlienWeapon

Improved handlig of alien melee and psi weapons
Merge remote-tracking branch 'supsuperorgin/master' into Extended

Conflicts:
	src/Battlescape/BattlescapeGame.cpp
	src/Savegame/BattleUnit.cpp
	src/Savegame/BattleUnit.h
	src/Savegame/SavedBattleGame.cpp
	src/Savegame/SavedBattleGame.h
Alien can now equip and use psiamps