Signed-off-by: starMelon <starmelon@foxmail.com>
Merge branch 'master' of https://github.com/ferry9303/MS_Project.git

Conflicts:
	MShop/src/config.properties

Signed-off-by: starMelon <starmelon@foxmail.com>