Merge branch 'measurement_tool' into jgrpp

# Conflicts:
#	src/viewport.cpp

src/viewport.cpp

@@ -102,6 +102,7 @@
 
 #include <map>
 #include <vector>
+#include <math.h>
 
 #include "table/strings.h"
 #include "table/string_colours.h"

src/viewport_type.h

@@ -15,7 +15,6 @@
 #include "zoom_type.h"
 #include "strings_type.h"
 #include "table/strings.h"
-#include "math.h"
 
 class LinkGraphOverlay;