better verbose for the npm adduser
update reuquire.js
resolve Conflicts and merge everything from wip
fix gruntfile
fix package.json
syntax errors are debugged