Merge branch 'develop' into MAX-324

Conflicts:
	macros.cmake
	server/core/config.c
	server/core/service.c
	server/modules/routing/CMakeLists.txt

query_classifier/query_classifier.cc

@@ -1219,7 +1219,8 @@ inline void add_str(char** buf, int* buflen, int* bufsize, char* str)
             if(*buf)
 		strcat(*buf," ");
 	}
-	strcat(*buf,str);
+        if(*buf)
+          strcat(*buf,str);
 	*buflen += isize;
 	
 }