Merge branch 'stefan-rajkovic-multiple-nearest-points' of https://github.com/srajkovic/osrm-backend into srajkovic-stefan-rajkovic-multiple-nearest-points

Conflicts:
	DataStructures/RouteParameters.cpp
	Server/APIGrammar.h

Include/osrm/RouteParameters.h

@@ -40,6 +40,8 @@ struct RouteParameters
     RouteParameters();
 
     void setZoomLevel(const short level);
+    
+    void setNumberOfResults(const short number);
 
     void setAlternateRouteFlag(const bool flag);
 
@@ -77,6 +79,7 @@ struct RouteParameters
     bool deprecatedAPI;
     bool uturn_default;
     unsigned check_sum;
+    short num_results;
     std::string service;
     std::string output_format;
     std::string jsonp_parameter;