adds action abort in technology
Merge remote-tracking branch 'origin/master'

* origin/master:
  little changes in some methods in fleet
  Time can't be < 0
  merge, update_ore FIX