layout界面ipad边框
Merge remote-tracking branch 'origin/master'

Conflicts:
	views/common/navbar.html