修改登录注册接口
Merge branch 'master' of https://github.com/iOS-Programmers/Shaping

Conflicts:
	Shaping/Categorys/ShapingEngine.h
	Shaping/Categorys/ShapingEngine.m