Only pay attention to right click for armor auto-selection (not middle, wheel, etc)
allow quick armourselection in quickbattle
small fix to CraftArmorState.cpp
reorder innitializers to make gcc happy (-Wreorder)
Moved "Discovered Techs" load before "Bases" loading to allow for
PsiStringEval true upon loading a new game.
Merge pull request #928 from FalkoOXC/updatequickarmorselect

in the quickbattle the quick armor selection works now too
Merge pull request #925 from ajschult/armor

Only notice right click for armor auto-selection (not middle, wheel, etc)
Merge pull request #933 from ajschult/ButtonReorder

reorder initializers to make gcc happy (-Wreorder)
"Craft id" is not globally unique, it's only unique to the craft type: use the craft object itself to identify who shot down an UFO
Merge pull request #935 from pkrcel/psi-statstrings-fix

Moved "Discovered Techs" load before "Bases" loading to allow for
Merge pull request #934 from hackbunny/craft_ids_not_globally_unique

"Craft id" is not globally unique, it's only unique to the craft type
Merge branch 'master' of https://github.com/SupSuper/OpenXcom into oXc_kL

Conflicts:
	src/Basescape/CraftArmorState.cpp
	src/Geoscape/DogfightState.cpp
	src/Interface/BattlescapeButton.cpp
	src/Savegame/SavedGame.cpp
	src/Savegame/Ufo.cpp
	src/Savegame/Ufo.h