注册页面：第一步
Merge branch 'master' of https://github.com/jinying0218/BuildingMaterials

# Via Aries (2) and jinying0218 (2)
* 'master' of https://github.com/jinying0218/BuildingMaterials:
  no message
  no message

Conflicts:
	BuildingMaterials.xcodeproj/project.pbxproj
	BuildingMaterials.xcworkspace/xcuserdata/Ariel.xcuserdatad/UserInterfaceState.xcuserstate
	BuildingMaterials/APP/Controller/Login/TSLoginViewController.xib