meituan
meituan png
Merge branch 'master' of github.com:beego/beeweb

Conflicts:
	views/home.html