add app appid196bodki3z
update
update
add ejs module
update
update bubbles
代码重构
add node_modules to BAE
change connection string
add weibo meta
change connection for duapp
Merge branch 'master' of https://git.duapp.com/appid196bodki3z into development

Conflicts:
	controllers/article.js
	controllers/site.js
	node_modules/ejs/package.json
	node_modules/eventproxy/node_modules/debug/package.json
	node_modules/eventproxy/package.json
	node_modules/express-partials/package.json
	node_modules/express/node_modules/buffer-crc32/package.json
	node_modules/express/node_modules/commander/package.json
	node_modules/express/node_modules/connect/node_modules/basic-auth-connect/package.json
	node_modules/express/node_modules/connect/node_modules/bytes/package.json
	node_modules/express/node_modules/connect/node_modules/compression/node_modules/compressible/package.json
	node_modules/express/node_modules/connect/node_modules/compression/node_modules/negotiator/package.json
	node_modules/express/node_modules/connect/node_modules/compression/package.json
	node_modules/express/node_modules/connect/node_modules/connect-timeout/package.json
	node_modules/express/node_modules/connect/node_modules/cookie-parser/package.json
	node_modules/express/node_modules/connect/node_modules/csurf/node_modules/uid2/package.json
	node_modules/express/node_modules/connect/node_modules/csurf/package.json
	node_modules/express/node_modules/connect/node_modules/errorhandler/package.json
	node_modules/express/node_modules/connect/node_modules/express-session/node_modules/debug/package.json
	node_modules/express/node_modules/connect/node_modules/express-session/node_modules/uid2/package.json
	node_modules/express/node_modules/connect/node_modules/express-session/node_modules/utils-merge/package.json
	node_modules/express/node_modules/connect/node_modules/express-session/package.json
	node_modules/express/node_modules/connect/node_modules/method-override/package.json
	node_modules/express/node_modules/connect/node_modules/morgan/package.json
	node_modules/express/node_modules/connect/node_modules/multiparty/node_modules/readable-stream/node_modules/isarray/package.json
	node_modules/express/node_modules/connect/node_modules/multiparty/node_modules/readable-stream/package.json
	node_modules/express/node_modules/connect/node_modules/multiparty/package.json
	node_modules/express/node_modules/connect/node_modules/qs/package.json
	node_modules/express/node_modules/connect/node_modules/raw-body/package.json
	node_modules/express/node_modules/connect/node_modules/response-time/package.json
	node_modules/express/node_modules/connect/node_modules/serve-index/node_modules/batch/package.json
	node_modules/express/node_modules/connect/node_modules/serve-index/node_modules/negotiator/package.json
	node_modules/express/node_modules/connect/node_modules/serve-index/package.json
	node_modules/express/node_modules/connect/node_modules/serve-static/package.json
	node_modules/express/node_modules/connect/node_modules/static-favicon/package.json
	node_modules/express/node_modules/connect/node_modules/vhost/package.json
	node_modules/express/node_modules/connect/package.json
	node_modules/express/node_modules/cookie-signature/package.json
	node_modules/express/node_modules/cookie/package.json
	node_modules/express/node_modules/fresh/package.json
	node_modules/express/node_modules/merge-descriptors/package.json
	node_modules/express/node_modules/range-parser/package.json
	node_modules/express/node_modules/send/package.json
	node_modules/express/package.json
	node_modules/mongoose/History.md
	node_modules/mongoose/README.md
	node_modules/mongoose/lib/connection.js
	node_modules/mongoose/lib/document.js
	node_modules/mongoose/lib/drivers/node-mongodb-native/connection.js
	node_modules/mongoose/lib/index.js
	node_modules/mongoose/lib/model.js
	node_modules/mongoose/lib/query.js
	node_modules/mongoose/lib/schema/number.js
	node_modules/mongoose/lib/schema/objectid.js
	node_modules/mongoose/lib/schema/string.js
	node_modules/mongoose/lib/schematype.js
	node_modules/mongoose/node_modules/hooks/package.json
	node_modules/mongoose/node_modules/mongodb/Readme.md
	node_modules/mongoose/node_modules/mongodb/lib/mongodb/auth/mongodb_cr.js
	node_modules/mongoose/node_modules/mongodb/lib/mongodb/auth/mongodb_sspi.js
	node_modules/mongoose/node_modules/mongodb/lib/mongodb/collection.js
	node_modules/mongoose/node_modules/mongodb/lib/mongodb/commands/delete_command.js
	node_modules/mongoose/node_modules/mongodb/lib/mongodb/commands/get_more_command.js
	node_modules/mongoose/node_modules/mongodb/lib/mongodb/commands/insert_command.js
	node_modules/mongoose/node_modules/mongodb/lib/mongodb/commands/query_command.js
	node_modules/mongoose/node_modules/mongodb/lib/mongodb/commands/update_command.js
	node_modules/mongoose/node_modules/mongodb/lib/mongodb/connection/base.js
	node_modules/mongoose/node_modules/mongodb/lib/mongodb/connection/connection.js
	node_modules/mongoose/node_modules/mongodb/lib/mongodb/connection/connection_pool.js
	node_modules/mongoose/node_modules/mongodb/lib/mongodb/connection/mongos.js
	node_modules/mongoose/node_modules/mongodb/lib/mongodb/connection/repl_set/ha.js
	node_modules/mongoose/node_modules/mongodb/lib/mongodb/connection/repl_set/repl_set.js
	node_modules/mongoose/node_modules/mongodb/lib/mongodb/connection/repl_set/strategies/ping_strategy.js
	node_modules/mongoose/node_modules/mongodb/lib/mongodb/connection/server.js
	node_modules/mongoose/node_modules/mongodb/lib/mongodb/cursor.js
	node_modules/mongoose/node_modules/mongodb/lib/mongodb/cursorstream.js
	node_modules/mongoose/node_modules/mongodb/lib/mongodb/db.js
	node_modules/mongoose/node_modules/mongodb/lib/mongodb/gridfs/gridstore.js
	node_modules/mongoose/node_modules/mongodb/lib/mongodb/gridfs/readstream.js
	node_modules/mongoose/node_modules/mongodb/lib/mongodb/mongo_client.js
	node_modules/mongoose/node_modules/mongodb/lib/mongodb/responses/mongo_reply.js
	node_modules/mongoose/node_modules/mongodb/lib/mongodb/utils.js
	node_modules/mongoose/node_modules/mongodb/node_modules/bson/browser_build/bson.js
	node_modules/mongoose/node_modules/mongodb/node_modules/bson/builderror.log
	node_modules/mongoose/node_modules/mongodb/node_modules/bson/ext/bson.cc
	node_modules/mongoose/node_modules/mongodb/node_modules/bson/ext/bson.h
	node_modules/mongoose/node_modules/mongodb/node_modules/bson/ext/win32/ia32/bson.node
	node_modules/mongoose/node_modules/mongodb/node_modules/bson/ext/win32/x64/bson.node
	node_modules/mongoose/node_modules/mongodb/node_modules/bson/lib/bson/bson.js
	node_modules/mongoose/node_modules/mongodb/node_modules/bson/package.json
	node_modules/mongoose/node_modules/mongodb/node_modules/kerberos/builderror.log
	node_modules/mongoose/node_modules/mongodb/node_modules/kerberos/lib/kerberos.h
	node_modules/mongoose/node_modules/mongodb/node_modules/kerberos/lib/kerberos_context.h
	node_modules/mongoose/node_modules/mongodb/node_modules/kerberos/lib/kerberosgss.c
	node_modules/mongoose/node_modules/mongodb/node_modules/kerberos/lib/win32/wrappers/security_buffer.cc
	node_modules/mongoose/node_modules/mongodb/node_modules/kerberos/lib/win32/wrappers/security_buffer_descriptor.cc
	node_modules/mongoose/node_modules/mongodb/node_modules/kerberos/lib/win32/wrappers/security_credentials.cc
	node_modules/mongoose/node_modules/mongodb/node_modules/kerberos/package.json
	node_modules/mongoose/node_modules/mongodb/package.json
	node_modules/mongoose/node_modules/mpath/package.json
	node_modules/mongoose/node_modules/mpromise/node_modules/sliced/package.json
	node_modules/mongoose/node_modules/mpromise/package.json
	node_modules/mongoose/node_modules/ms/package.json
	node_modules/mongoose/node_modules/muri/package.json
	node_modules/mongoose/node_modules/regexp-clone/package.json
	node_modules/mongoose/node_modules/sliced/History.md
	node_modules/mongoose/node_modules/sliced/Makefile
	node_modules/mongoose/node_modules/sliced/lib/sliced.js
	node_modules/mongoose/node_modules/sliced/package.json
	node_modules/mongoose/package.json
	node_modules/mongoose/static.js
	node_modules/mongoose/website.js
	node_modules/validator/package.json
	public/stylesheets/style.css
	routes.js
	views/layout.html
merge node_modules
添加分享微博功能
删除注册按钮
Merge branch 'development'
merge weibo share function of development branch
完成分类列表的点击
Merge branch 'development'