Merge branch 'master' into master

Author: ned29

src/main/resources/public/raml/eiffel-intelligence.raml

@@ -27,7 +27,8 @@
   mediaType: application/json
   baseUri: /
   /subscriptions: !include subscription.raml
-  /query: !include query.raml
+  /query: !include queryservice.raml  
   /queryAggregatedObject: !include query-aggregated_object.raml
   /queryMissedNotifications: !include query-missed_notifications.raml
-  /jmespathrule: !include jmespath.raml
+  /jmespathrule: !include jmespath.raml
+  /download: !include template.raml