...
Merge branch 'node' of github.com:lstopar/qminer

Conflicts:
	src/qminer/nodejs/qm/qm_nodejs.cpp
	src/qminer/nodejs/utils.h