Update README.md
Install development dependencies
Added jsdoc task
.gitgnore doc/client and doc/server
Added jshint task
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'upstream/master'

Conflicts:
	package.json
Merge remote-tracking branch 'origin/master'