Merge branch 'master' of ssh://git@github.com/y3shop/jmall.git

Conflicts:
	.gitignore