Cleaned up unnecessary test structure
Refactored ContextSettings into ContextBundle
Moved rights/roles to PermissionsProvider
Merge remote-tracking branch 'origin/master' into Development