progress
Merge branch 'master' of github.com:Handbid/WallStreet-iOS

Conflicts:
	Classes/Connection/WSConnectionManager.h
	Classes/Connection/WSConnectionManager.m
	Classes/Core-deprecated/WSCore.h-old
	Classes/Core-deprecated/WSCore.m-old
	Classes/Entity/WSBaseEntity+Fetch.h
	Classes/Entity/WSBaseEntity+Fetch.m
	Classes/Entity/WSUserEntity.h
	Classes/Module/Date/WSDateModule.h
	Classes/Module/Date/WSDateModule.m
	Classes/Module/Form/Component/Table/ElementRenderer/WSBaseFormElementRenderer.h
	Classes/Module/Form/Component/Table/ElementRenderer/WSBaseFormElementRenderer.m
	Classes/Module/Form/Component/Table/ElementRenderer/WSFormElementRendererEmail.h
	Classes/Module/Form/Component/Table/ElementRenderer/WSFormElementRendererEmail.m
	Classes/Module/Form/Component/Table/ElementRenderer/WSFormElementRendererText.h
	Classes/Module/Form/Component/Table/ElementRenderer/WSFormElementRendererText.m
	Classes/Module/Form/Component/Table/WSFormTable.h
	Classes/Module/Form/Component/Table/WSFormTable.m
	Classes/Module/Form/Component/WSBaseForm.h
	Classes/Module/Form/Component/WSBaseForm.m
	Classes/Module/Form/Component/WSFormBroker.h
	Classes/Module/Form/Component/WSFormBroker.m
	Classes/Module/Form/Component/WSFormElement.h
	Classes/Module/Form/Component/WSFormElement.m
	Classes/Module/Form/Component/WSFormFactory.h
	Classes/Module/Form/Component/WSFormFactory.m
	Classes/Module/Form/Component/WSFormFieldset.h
	Classes/Module/Form/Component/WSFormFieldset.m
	Classes/Module/Form/WSFormModule.h
	Classes/Module/Form/WSFormModule.m
	Classes/Module/Proximity/IFProximityModuleSchema.plist
	Classes/Module/Proximity/WSProximityModuleSchema.plist
	Classes/Module/Proximity/WSProximityProtocol.h
	Classes/Module/User/IFUserModuleSchema.plist
	Classes/Module/User/WSUserModuleSchema.plist
	Classes/WSToolKit.h
	Classes/WallStreet/WSEntityBroker.h
	Classes/WallStreet/WSEntityBroker.m
	Classes/WallStreet/WSModuleBroker.h
	Classes/WallStreet/WSModuleBroker.m
	Classes/WallStreet/WallStreet.h
	Classes/WallStreet/WallStreet.m
	README.md
	WallStreet.podspec
	backup/Proximity/WSProximityModuleSchema.plist
	backup/User/WSTokenAuthEntity.h
	backup/User/WSTokenAuthEntity.m
	backup/User/WSUserModule.m
	backup/User/WSUserModuleSchema.plist