removed node_modules from git
Merge remote-tracking branch 'origin/1.2v' into 1.2v