changed pic size and edited error pages
Merge branch 'master' of https://github.com/rayhaoray/eatDemo

Conflicts:
	public/image/detail/001002/2.jpg
	public/image/detail/001002/3.jpg
	public/image/detail/001007/2.jpg
	public/image/detail/001007/3.jpg
	public/image/detail/004004/2.jpg
	public/image/detail/004004/3.jpg
	public/image/detail/006001/2.jpg
	public/image/detail/006001/3.jpg
	public/image/detail/006002/2.jpg
	public/image/detail/006002/3.jpg
	public/image/detail/007001/2.jpg
	public/image/detail/007001/3.jpg
Merge branch 'master' of https://github.com/rayhaoray/eatDemo