Merge branch 'dev' into chose-points
QuadTree with lines
removed unused file
Merge branch 'dev' into tcuje
merged chose-points into tcuje
Merge branch 'master' into tcuje
Revert "merged chose-points into tcuje"

This reverts commit 20fe991829553a318066986a211fe352126dee71, reversing
changes made to ca7fceddda474b1ccde7a44228fe7e8b917bb1d3.
formatting
minor changes
merged chose-points into tcuje
DB fix
merged michael into tcuje
Merge branch 'dev'