rename
Merge remote-tracking branch 'github/master'

Conflicts:
	views/admin/blogList.html
Merge branch 'master' of https://github.com/hpgt/nodejs-demo
rename