fixes technology assoziations
Merge remote-tracking branch 'origin/master'

* origin/master:
  *FixColumnNames to english, *Planet.update_ore()
  method name changes in planet.rb