add log4js and feedparser
Merge branch 'master' of https://github.com/ISTang/Notification-Push

Conflicts:
	src/server/node_modules/log4js/lib/appenders/clustered.js
	src/server/node_modules/log4js/lib/appenders/gelf.js
	src/server/node_modules/log4js/lib/appenders/multiprocess.js
	src/server/node_modules/log4js/node_modules/.bin/semver
	src/server/node_modules/log4js/node_modules/readable-stream/package.json
	src/server/node_modules/log4js/node_modules/semver/package.json
	src/server/node_modules/log4js/package.json
	src/server/node_modules/log4js/test/clusteredAppender-test.js
	src/server/node_modules/log4js/test/multiprocess-test.js
	src/server/node_modules/log4js/test/streams/test-rolling-stream-with-existing-files
	src/server/node_modules/log4js/test/streams/test-rolling-stream-with-existing-files.1