Merge branch 'dev' into canary

Author: Francesca-Bit

lib/query/woqlBuilder.js

@@ -3,6 +3,8 @@
  * module WOQLQuery
  */
 const WOQLQuery = require('./woqlSchema')
+//const WOQLQuery = require('./woqlCore')
+//const WOQLSchema = require('./woqlSchema')
 const WOQLLibrary = require('./woqlLibrary')
 
 /*class WOQLQuery extends WOQLQueryImp {

lib/query/woqlLibrary.js

@@ -1,5 +1,6 @@
 //@ts-check
 const WOQLQuery = require('./woqlCore')
+//const WOQLJSON = require('./woqlQuery')
 const WOQL = require('../woql')
 
 const ww = new WOQLQuery()