app.js and some pages edit
Merge branch 'master' of https://github.com/sanddudu/LightBlog

Conflicts:
	app.js