Merge remote branch 'pb/master' into network-analysis

Conflicts:
	src/analysis/network/qgsdistanceedgeproperter.cpp
	src/analysis/network/qgsgraphbuilder.h
	src/plugins/roadgraph/graphbuilder.h
	src/plugins/roadgraph/linevectorlayerdirector.cpp
	src/plugins/roadgraph/roadgraphplugin.cpp
	src/plugins/roadgraph/shortestpathwidget.cpp
	src/plugins/roadgraph/simplegraphbuilder.cpp