Merge branch 'master' of http://git.oschina.net/luwancai163/eshop.git

Conflicts:
	.classpath