Bugs Solve
Merge commit 'cc88159ad3e3abaaffc9327e39f9d64806ee74f8'

Conflicts:
	.gitignore
	node_modules/express/bin/express
	node_modules/jade/bin/jade.js
	node_modules/jade/node_modules/constantinople/node_modules/uglify-js/bin/uglifyjs
	node_modules/jade/node_modules/mkdirp/bin/cmd.js
	node_modules/jade/node_modules/mkdirp/bin/usage.txt
	node_modules/jade/node_modules/transformers/node_modules/uglify-js/bin/uglifyjs
	node_modules/jade/node_modules/with/node_modules/uglify-js/bin/uglifyjs
	node_modules/mongoose/node_modules/mongodb/node_modules/bson/builderror.log
	node_modules/mongoose/node_modules/mongodb/node_modules/bson/v8.log
	node_modules/mongoose/node_modules/mongodb/node_modules/kerberos/builderror.log
	node_modules/ntwitter/lib/keys.js
	node_modules/socket.io/node_modules/engine.io/node_modules/engine.io-parser/lib/keys.js
	node_modules/socket.io/node_modules/engine.io/node_modules/engine.io-parser/node_modules/utf8/coverage/index.html
	node_modules/socket.io/node_modules/engine.io/node_modules/engine.io-parser/node_modules/utf8/coverage/prettify.css
	node_modules/socket.io/node_modules/engine.io/node_modules/engine.io-parser/node_modules/utf8/coverage/prettify.js
	node_modules/socket.io/node_modules/engine.io/node_modules/engine.io-parser/node_modules/utf8/coverage/utf8.js/index.html
	node_modules/socket.io/node_modules/engine.io/node_modules/engine.io-parser/node_modules/utf8/coverage/utf8.js/utf8.js.html
	node_modules/socket.io/node_modules/engine.io/node_modules/ws/bin/wscat
	node_modules/socket.io/node_modules/engine.io/node_modules/ws/builderror.log
	node_modules/socket.io/node_modules/socket.io-adapter/node_modules/socket.io-parser/node_modules/json3/coverage/coverage.json
	node_modules/socket.io/node_modules/socket.io-adapter/node_modules/socket.io-parser/node_modules/json3/coverage/lcov-report/lib/json3.js.html
	node_modules/socket.io/node_modules/socket.io-adapter/node_modules/socket.io-parser/node_modules/json3/coverage/lcov-report/prettify.css
	node_modules/socket.io/node_modules/socket.io-adapter/node_modules/socket.io-parser/node_modules/json3/coverage/lcov-report/prettify.js
	node_modules/socket.io/node_modules/socket.io-adapter/node_modules/socket.io-parser/node_modules/json3/coverage/lcov.info
	node_modules/socket.io/node_modules/socket.io-client/node_modules/engine.io-client/node_modules/engine.io-parser/lib/keys.js
	node_modules/socket.io/node_modules/socket.io-client/node_modules/engine.io-client/node_modules/engine.io-parser/node_modules/utf8/coverage/index.html
	node_modules/socket.io/node_modules/socket.io-client/node_modules/engine.io-client/node_modules/engine.io-parser/node_modules/utf8/coverage/prettify.css
	node_modules/socket.io/node_modules/socket.io-client/node_modules/engine.io-client/node_modules/engine.io-parser/node_modules/utf8/coverage/prettify.js
	node_modules/socket.io/node_modules/socket.io-client/node_modules/engine.io-client/node_modules/engine.io-parser/node_modules/utf8/coverage/utf8.js/index.html
	node_modules/socket.io/node_modules/socket.io-client/node_modules/engine.io-client/node_modules/engine.io-parser/node_modules/utf8/coverage/utf8.js/utf8.js.html
	node_modules/socket.io/node_modules/socket.io-client/node_modules/engine.io-client/node_modules/ws/bin/wscat
	node_modules/socket.io/node_modules/socket.io-client/node_modules/engine.io-client/node_modules/ws/builderror.log
	node_modules/socket.io/node_modules/socket.io-client/node_modules/socket.io-parser/node_modules/json3/coverage/coverage.json
	node_modules/socket.io/node_modules/socket.io-client/node_modules/socket.io-parser/node_modules/json3/coverage/lcov-report/lib/json3.js.html
	node_modules/socket.io/node_modules/socket.io-client/node_modules/socket.io-parser/node_modules/json3/coverage/lcov-report/prettify.css
	node_modules/socket.io/node_modules/socket.io-client/node_modules/socket.io-parser/node_modules/json3/coverage/lcov-report/prettify.js
	node_modules/socket.io/node_modules/socket.io-client/node_modules/socket.io-parser/node_modules/json3/coverage/lcov.info
	node_modules/socket.io/node_modules/socket.io-parser/node_modules/json3/coverage/coverage.json
	node_modules/socket.io/node_modules/socket.io-parser/node_modules/json3/coverage/lcov-report/lib/json3.js.html
	node_modules/socket.io/node_modules/socket.io-parser/node_modules/json3/coverage/lcov-report/prettify.css
	node_modules/socket.io/node_modules/socket.io-parser/node_modules/json3/coverage/lcov-report/prettify.js
	node_modules/socket.io/node_modules/socket.io-parser/node_modules/json3/coverage/lcov.info