Link up Users to their models
Update annotations
Add Student Preferences
User can now change password
Login stuff
Quick and dirty error fix
layouts for all entities
Merge commit 'c32653909de2c0eb3f2f8155a031f13b20b5107e'

* commit 'c32653909de2c0eb3f2f8155a031f13b20b5107e':
  layouts for all entities
  Quick and dirty error fix
  Login stuff
  User can now change password
  Add Student Preferences
  Update annotations
  Link up Users to their models