FARO-28 refactor
FARO-28 refactor

icapps/ios-air-rivet,icapps/ios-air-rivet,icapps/ios-air-rivet,icapps/ios-faro,icapps/ios-air-rivet,icapps/ios-faro,icapps/ios-air-rivet,icapps/ios-faro,icapps/swiftGenericWebService,icapps/ios-faro