fixed upgrade_technology method, adds test-entries in UserTechnology
Merge remote-tracking branch 'origin/master'

* origin/master: (28 commits)
  *Stylesheet fix
  alliance changes
  fixed methods in fleet
  Ship - fleet_id err fix
  helper mit seeds gefüllt
  helper mit seeds gefüllt
  -Removed planets generating
  *Fixed GalaxyHelper Bug
  +GalaxiesView, +
  mention Methode in Planets, Sunsystems, Galaxy
  helper mit seeds gefüllt
  helper mit seeds gefüllt
  seeds created (requirements for technology)
  Ship.save overwritten
  added commented methods for ships
  Added Column origin_planet to fleet
  added methods for getting ships
  new stuff
  merge
  added alliance functionality
  ...

Conflicts:
	app/helpers/technologies_helper.rb
	app/models/technology_require.rb
	db/schema.rb
	db/seeds.rb