+Layoutschema as _template
method technology_require added
Merge remote-tracking branch 'origin/master'

* origin/master:
  Added has_many: fleets for Planets
  addet relation fleet to planet
  merge
  Fixed error in registration progress. Changed login-method to username/password instead of email/password
  fixed relation fleet mission
  fixed entityname for buildingtypes ships
  Migration fix of migration fix in users scaffold
  added resque-scheduler
  Migration in users fixed
  +Universerelations
  merge
  ...
  added Association Fleet-Ship
  adds nm table buildingtypes ships
  Added ship_technology
  Added Migration for ship_technology
  nix
  test

Conflicts:
	.idea/workspace.xml