Merge branch 'master' of https://github.com/mrcrgl/node-querybuilder

Conflicts:
	index.js
	package.json