Added Quadrat
Merge remote-tracking branch 'origin/Gustav-Dev' into Alex-Dev