Changed field name in TStMerger from "mergingMapV" to "fields".
Merge branch 'master' of https://github.com/rupnikj/qminer

Conflicts:
	src/qminer/qminer_js.cpp
Merge branch 'master' of https://github.com/rupnikj/qminer
to "fields"."

This reverts commit a60709addbfa27b3b9b0b69cf929b1d0e8318308.

Conflicts:
	src/qminer/qminer_js.cpp

Conflicts:
	src/qminer/qminer_js.cpp
Merge branch 'master' of https://github.com/rupnikj/qminer
Merge branch 'master' of https://github.com/qminer/qminer
time.js
Added unit test for TStMerger.
assert doc
Merge branch 'master' of github.com:bkazic/qminer
docinteli