Merge branch 'master' into jgrpp

# Conflicts:
#	config.lib
#	src/linkgraph/demands.cpp
#	src/linkgraph/mcf.cpp
#	src/linkgraph/refresh.cpp
#	src/linkgraph/refresh.h
#	src/smallmap_gui.cpp

src/linkgraph/mcf.cpp

@@ -68,6 +68,7 @@ public:
  */
 class CapacityAnnotation : public Path {
 	int cached_annotation;
+
 public:
 	typedef int AnnotationValueType;