Very accurate counting bullets and clips, left after battle.
fixed compilation errors in Linux
loftempsSet defined via armour
removed comments
revert Armor class constructor
Second attempt to fix gcc-4.4 errors

This time by renaming functions.
Merge remote branch 'upstream/master' into fixLinuxMouseWheel
quickPsiTraining option

-Any soldier can be placed into or removed from psy-training at any time.
-Initially soldiers will start with a negative psy-skill value which will be used to determine how many more days of psy-training they need to unlock their psy-potential.
-Psy-Training calculated every day at 0:00
-Soldiers with psy-skill < 0 would get ++psy-skill each day
-Soldiers with psy-skill == 0 would get +14 to +26 psy-skill
-Soldiers with psy-skill > 0 have a chance of getting a psy-skill equal to 10/(psy-skill)
-You can anytime switch to (or from) vanilla behavior
interface improvement; return back some code.
initial training from 30 to 50 days - close to vanilla behavior
rename option to "anytimePsiTraining"; code optimisation
check psiSkill <= 0
"Improvement" column - only for training in psi-lab
PsiTraining button moved to SoldiersState.
Merge branch 'master' of https://github.com/SupSuper/OpenXcom.git into psionic_training
Advanced options description
Russian adv.option description
"_improvement" behavior changed
possibility return back vanilla behavior improved
Merge pull request #455 from Xracer/master

Updated Spanish (AL)