Conflicts:
	examples/example-queries.html
	src/queries/begin.js
	src/queries/parser-begin.js
	src/queries/parser-end.js
	src/queries/query.js