Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'

Conflicts:
	node_modules/.bin/jade
	node_modules/jade/node_modules/constantinople/node_modules/.bin/uglifyjs
	node_modules/jade/node_modules/transformers/node_modules/.bin/uglifyjs
	node_modules/jade/node_modules/with/node_modules/.bin/uglifyjs
	node_modules/socket.io/node_modules/engine.io/node_modules/.bin/wscat
	node_modules/socket.io/node_modules/socket.io-client/node_modules/engine.io-client/node_modules/.bin/wscat