*strg flips view again
Merge branch 'treemap-core'
Merge branch 'controller'
+collision handling buggy