提交
Merge branch 'master' of https://github.com/supersky07/pageMonitor

Conflicts:
	app/js/modules/fans/fansCtrl.js
	node/.pid