change dd
Merge branch 'master' of https://github.com/mephju/node-txn-cluster

Conflicts:
	js/dataset-defs.js
Merge remote-tracking branch 'origin/master'
Merge branch 'master' of https://github.com/mephju/node-txn-cluster
Merge branch 'master' of https://github.com/mephju/node-txn-cluster
Merge remote-tracking branch 'origin/master'

Conflicts:
	js/dataset-defs.js
Merge branch 'master' of https://github.com/mephju/node-txn-cluster
Merge branch 'master' of https://github.com/mephju/node-txn-cluster
Merge remote-tracking branch 'origin/master'
fixed dataset-def error