adds columns to user_settings
fixed jobs
Merge remote-tracking branch 'origin/master'

* origin/master:
  Added seach Planet
  Removed Javascript (kann jemand TURBOLINKS deaktivieren?) Removed Herobrine
  Added claim Method for planet
  merge
  Merge, Worldloading faster, changed Views, Performanceboost
  minor changes in fleetmodel, seeds and ships helper
  Migration BuildingtypeRelatons
  +Add Buildingcreate Method and the requirements
  fixes in update_resources in planet.rb
  Edited Move method and Edited Ship-Attributes
  added FEW prerequisites and added a method for fleets
  Scaffold Report, changed Battlereport
  Alliance founders can now kick users
  fixes in technology