Zoek en sorteer balkje
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/webapp/css/style.css
	src/main/webapp/partials/home.html
Search functionality done
Merge branch 'master' of https://github.com/utwente-di/di06

Conflicts:
	src/main/webapp/partials/home.html
Merge branch 'master' of https://github.com/utwente-di/di06

Conflicts:
	src/main/webapp/partials/home.html
Added white logo
Added Role model
Added comments and changed contructor of Role
Added roles to login model and updated data fixtures
Added adding of roles to teacher and employee creation
Changed fetchtype to eager, prevents 500 in some cases
Added RolesRequired annotation
Fixed, removed typo
Fixed annotation
Session is now saved in a cookie until the user logs out
Added x-session-token header to requests
Removed responseFilter code, this was replaced by the requestFilter
Fixed hibernet.cfg ordening
Fixed indenting in bower.json
Fix for null pointer when token is not found