Merge branch 'master' of /home/filip/programsandprojects/Areabase-git/areabase with conflicts.
Moving the graphs to their own activity. This is hard.