modification on Frontend
Modifications on frontend
Merge branch 'master' of https://github.com/ScartleRoy/Weibo.Zhuoyou

Conflicts:
	app.db